diff --git a/src/browserconfig.xml b/src/browserconfig.xml
new file mode 100644
index 0000000000..320299fafb
--- /dev/null
+++ b/src/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square150x150logo src="images/icons/mstile-150x150.png"/>
+      <TileColor>#3c8dbc</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>
diff --git a/src/favicon.ico b/src/favicon.ico
index f2aadce414..d71b82addf 100644
Binary files a/src/favicon.ico and b/src/favicon.ico differ
diff --git a/src/images/icons/android-chrome-192x192.png b/src/images/icons/android-chrome-192x192.png
new file mode 100644
index 0000000000..d821320ced
Binary files /dev/null and b/src/images/icons/android-chrome-192x192.png differ
diff --git a/src/images/icons/android-chrome-512x512.png b/src/images/icons/android-chrome-512x512.png
new file mode 100644
index 0000000000..0ec07e5bb2
Binary files /dev/null and b/src/images/icons/android-chrome-512x512.png differ
diff --git a/src/images/icons/apple-touch-icon.png b/src/images/icons/apple-touch-icon.png
new file mode 100644
index 0000000000..db5ea8fabc
Binary files /dev/null and b/src/images/icons/apple-touch-icon.png differ
diff --git a/src/images/icons/favicon-16x16.png b/src/images/icons/favicon-16x16.png
new file mode 100644
index 0000000000..1bc2341be5
Binary files /dev/null and b/src/images/icons/favicon-16x16.png differ
diff --git a/src/images/icons/favicon-32x32.png b/src/images/icons/favicon-32x32.png
new file mode 100644
index 0000000000..ea0254cc2b
Binary files /dev/null and b/src/images/icons/favicon-32x32.png differ
diff --git a/src/images/icons/mstile-150x150.png b/src/images/icons/mstile-150x150.png
new file mode 100644
index 0000000000..3b0c1bcb7a
Binary files /dev/null and b/src/images/icons/mstile-150x150.png differ
diff --git a/src/images/icons/safari-pinned-tab.svg b/src/images/icons/safari-pinned-tab.svg
new file mode 100644
index 0000000000..ba3e45fa89
--- /dev/null
+++ b/src/images/icons/safari-pinned-tab.svg
@@ -0,0 +1,26 @@
+<?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="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M824 4945 c-92 -16 -133 -30 -218 -71 -91 -45 -150 -90 -229 -173
+-112 -119 -182 -263 -207 -427 -7 -47 -10 -598 -8 -1759 l3 -1690 22 -70 c32
+-103 58 -160 108 -234 88 -132 222 -243 367 -300 157 -63 87 -61 1892 -61
+1797 0 1750 -1 1900 59 239 96 408 289 483 551 17 62 18 145 18 1790 0 1645
+-1 1728 -18 1790 -44 155 -111 272 -214 372 -106 105 -218 170 -362 211 l-76
+22 -1695 2 c-1357 1 -1709 -1 -1766 -12z m3196 -617 c18 -13 41 -39 51 -58 18
+-33 19 -79 19 -1000 -1 -866 -4 -1026 -25 -1131 -26 -136 -150 -397 -251 -534
+-81 -109 -302 -330 -439 -441 -105 -85 -296 -216 -390 -270 -11 -6 -60 -34
+-108 -62 -146 -86 -272 -142 -316 -142 -102 0 -530 247 -811 469 -143 112
+-385 359 -462 471 -102 148 -175 300 -226 475 l-26 90 -4 1010 c-2 719 0 1021
+8 1048 7 25 24 47 52 67 l41 30 1427 0 1427 0 33 -22z"/>
+<path d="M2560 2540 l0 -1350 38 19 c231 118 489 307 683 500 181 180 265 309
+321 488 21 66 21 87 25 881 l4 812 -535 0 -536 0 0 -1350z"/>
+</g>
+</svg>
diff --git a/src/index.html b/src/index.html
index 710d5ac8d9..05d84bdf0b 100644
--- a/src/index.html
+++ b/src/index.html
@@ -77,6 +77,7 @@
             *;">
     <!-- @endif -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="theme-color" content="#3c8dbc">
     <base href="/" />
 
     <title page-title>bitwarden Web Vault</title>
@@ -103,6 +104,11 @@
 
     <link rel="stylesheet" href="css/vault.css" />
     <!-- @endexclude -->
+    <link rel="apple-touch-icon" sizes="180x180" href="images/icons/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="images/icons/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="images/icons/favicon-16x16.png">
+    <link rel="mask-icon" href="images/icons/safari-pinned-tab.svg" color="#3c8dbc">
+    <link rel="manifest" href="manifest.json">
 </head>
 <body ng-controller="mainController as main" class="layout-boxed {{main.skinClass}} sidebar-mini {{main.bodyClass}}"
       ng-class="{'using-control-sidebar': main.usingControlSidebar,
diff --git a/src/manifest.json b/src/manifest.json
new file mode 100644
index 0000000000..06f20a7d49
--- /dev/null
+++ b/src/manifest.json
@@ -0,0 +1,17 @@
+{
+  "name": "bitwarden",
+  "icons": [
+    {
+      "src": "images/icons/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "images/icons/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#3c8dbc",
+  "background_color": "#3c8dbc"
+}
\ No newline at end of file