diff --git a/openstack_dashboard/static/dashboard/img/apple-touch-icon.png b/openstack_dashboard/static/dashboard/img/apple-touch-icon.png
new file mode 100644
index 0000000000..cec3198d2f
Binary files /dev/null and b/openstack_dashboard/static/dashboard/img/apple-touch-icon.png differ
diff --git a/openstack_dashboard/static/dashboard/img/safari-pinned-tab.svg b/openstack_dashboard/static/dashboard/img/safari-pinned-tab.svg
new file mode 100644
index 0000000000..702fcf89bc
--- /dev/null
+++ b/openstack_dashboard/static/dashboard/img/safari-pinned-tab.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="260.000000pt" height="260.000000pt" viewBox="0 0 260.000000 260.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,260.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M175 2534 c-48 -18 -99 -65 -128 -119 -20 -38 -21 -55 -23 -352 l-2
+-312 284 0 c190 1 286 4 290 11 4 6 8 36 8 67 2 64 23 104 69 128 45 23 1213
+21 1258 -2 43 -23 63 -61 66 -124 1 -31 2 -62 2 -68 1 -10 66 -12 289 -10
+l287 2 0 310 c-1 296 -2 312 -22 350 -27 51 -64 88 -111 112 -35 17 -90 18
+-1132 20 -940 1 -1101 0 -1135 -13z"/>
+<path d="M23 1300 l0 -290 288 0 c224 0 289 3 290 13 1 16 1 550 0 560 -1 4
+-131 7 -290 7 l-288 0 0 -290z"/>
+<path d="M1997 1312 c1 -152 2 -283 2 -289 1 -10 66 -13 290 -13 l288 0 0 290
+0 290 -291 0 -291 0 2 -278z"/>
+<path d="M24 537 c1 -298 2 -314 23 -352 27 -51 64 -88 111 -112 35 -17 91
+-18 1127 -21 1203 -3 1147 -5 1214 60 18 18 42 50 54 72 20 39 21 55 23 353
+l2 312 -284 0 c-188 -1 -286 -5 -291 -11 -3 -6 -7 -37 -8 -68 -1 -66 -20 -102
+-66 -125 -26 -14 -104 -16 -628 -17 -532 0 -602 2 -629 16 -47 25 -67 61 -69
+130 -1 34 -2 64 -2 68 -1 3 -131 6 -290 7 l-288 0 1 -312z"/>
+</g>
+</svg>
diff --git a/openstack_dashboard/templates/500.html b/openstack_dashboard/templates/500.html
index 66258203d7..705b279a68 100644
--- a/openstack_dashboard/templates/500.html
+++ b/openstack_dashboard/templates/500.html
@@ -17,6 +17,8 @@
   <head>
     <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
     <link rel="shortcut icon" href="{% static "dashboard/img/favicon.ico" %}"/>
+    <link rel="apple-touch-icon" sizes="180x180" href="{% static 'dashboard/img/apple-touch-icon.png' %}" />
+    <link rel="mask-icon" href="{% static 'dashboard/img/safari-pinned-tab.svg' %}" color="#5bbad5" />
     <title>{% trans "Server error" %} - {% site_branding %}</title>
     {% block css %}
     <style>
diff --git a/openstack_dashboard/templates/_stylesheets.html b/openstack_dashboard/templates/_stylesheets.html
index 2848eb108d..6de226f936 100644
--- a/openstack_dashboard/templates/_stylesheets.html
+++ b/openstack_dashboard/templates/_stylesheets.html
@@ -27,3 +27,5 @@
 {% endwith %}
 
 <link rel="shortcut icon" href="{% themable_asset 'img/favicon.ico' %}"/>
+<link rel="apple-touch-icon" sizes="180x180" href="{% themable_asset 'img/apple-touch-icon.png' %}" />
+<link rel="mask-icon" href="{% themable_asset 'img/safari-pinned-tab.svg' %}" color="#5bbad5" />
