diff --git a/python_docs_theme/layout.html b/python_docs_theme/layout.html
index c4a48fa6..a8a8da70 100644
--- a/python_docs_theme/layout.html
+++ b/python_docs_theme/layout.html
@@ -2,6 +2,8 @@
 
 {% block rootrellink %}
     <li><img src="{{ pathto('_static/' + theme_root_icon, 1) }}" alt=""
+             width="16px"
+             height="16px"
              style="vertical-align: middle; margin-top: -1px"/></li>
     <li><a href="{{theme_root_url}}">{{theme_root_name}}</a>{{ reldelim1 }}</li>
     {% if theme_root_include_title %}
@@ -36,7 +38,18 @@
 {% endblock %}
 
 {% block extrahead %}
-    <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/' + theme_root_icon, 1) }}" />
+    {# Place icon files in the root if possible (let browsers look for them where they expect them to be) #}
+    <link rel="icon" type="image/x-icon" href="{{ pathto('_static/' + theme_root_favicon, 1) }}" />
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ pathto('_static/' + theme_apple_touch_icon_144x144, 1) }}" />
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ pathto('_static/' + theme_apple_touch_icon_72x72, 1) }}" />
+    <link rel="apple-touch-icon-precomposed" href="{{ pathto('_static/' + theme_apple_touch_icon, 1) }}" />
+    <link rel="apple-touch-icon" href="{{ pathto('_static/' + theme_apple_touch_icon, 1) }}" />
+
+    {# Tile icon for Win8 (icon + tile color) #}
+    <meta name="msapplication-TileImage" content="{{ pathto('_static/' + theme_msapplication_tileimage, 1) }}">
+    <meta name="msapplication-TileColor" content="{{ theme_msapplication_tilecolor }}">
+    <meta name="msapplication-navbutton-color" content="{{ theme_msapplication_tilecolor }}">
+
     {% if builder != "htmlhelp" %}
     {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
     {% endif %}
diff --git a/python_docs_theme/static/apple-touch-icon-144x144-precomposed.png b/python_docs_theme/static/apple-touch-icon-144x144-precomposed.png
new file mode 100644
index 00000000..f1fbbbd1
Binary files /dev/null and b/python_docs_theme/static/apple-touch-icon-144x144-precomposed.png differ
diff --git a/python_docs_theme/static/apple-touch-icon-72x72-precomposed.png b/python_docs_theme/static/apple-touch-icon-72x72-precomposed.png
new file mode 100644
index 00000000..09626fb6
Binary files /dev/null and b/python_docs_theme/static/apple-touch-icon-72x72-precomposed.png differ
diff --git a/python_docs_theme/static/apple-touch-icon-precomposed.png b/python_docs_theme/static/apple-touch-icon-precomposed.png
new file mode 100644
index 00000000..ffe35436
Binary files /dev/null and b/python_docs_theme/static/apple-touch-icon-precomposed.png differ
diff --git a/python_docs_theme/static/favicon.ico b/python_docs_theme/static/favicon.ico
new file mode 100644
index 00000000..c9efc584
Binary files /dev/null and b/python_docs_theme/static/favicon.ico differ
diff --git a/python_docs_theme/static/metro-icon-144x144.png b/python_docs_theme/static/metro-icon-144x144.png
new file mode 100644
index 00000000..25f44804
Binary files /dev/null and b/python_docs_theme/static/metro-icon-144x144.png differ
diff --git a/python_docs_theme/static/py.png b/python_docs_theme/static/py.png
index 93e4a02c..ffe35436 100644
Binary files a/python_docs_theme/static/py.png and b/python_docs_theme/static/py.png differ
diff --git a/python_docs_theme/theme.conf b/python_docs_theme/theme.conf
index bffa8c1c..4eb0d2eb 100644
--- a/python_docs_theme/theme.conf
+++ b/python_docs_theme/theme.conf
@@ -27,5 +27,14 @@ codetextcolor = #333333
 issues_url = 
 root_name = Python
 root_url = https://www.python.org/
+root_favicon = favicon.ico
 root_icon = py.png
 root_include_title = True
+
+apple_touch_icon_144x144 = apple-touch-icon-144x144-precomposed.png
+apple_touch_icon_72x72 = apple-touch-icon-72x72-precomposed.png
+apple_touch_icon = apple-touch-icon-precomposed.png
+
+msapplication_tileimage = metro-icon-144x144.png
+msapplication_tilecolor = #3673a5
+msapplication_navbutton_color = #3673a5