diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
new file mode 100644
index 000000000..23685f662
Binary files /dev/null and b/public/android-chrome-192x192.png differ
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
new file mode 100644
index 000000000..5141cd4d1
Binary files /dev/null and b/public/android-chrome-512x512.png differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index 2a5a5d1f0..0c6635284 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
new file mode 100644
index 000000000..5f3d84ea1
Binary files /dev/null and b/public/favicon-16x16.png differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
new file mode 100644
index 000000000..49fbbe231
Binary files /dev/null and b/public/favicon-32x32.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
index 464d8b596..ddbaac614 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/manifest.json b/public/manifest.json
new file mode 100644
index 000000000..ba8c9a303
--- /dev/null
+++ b/public/manifest.json
@@ -0,0 +1,17 @@
+{
+	"name": "Invoice Ninja",
+	"icons": [
+		{
+			"src": "\/android-chrome-192x192.png",
+			"sizes": "192x192",
+			"type": "image\/png"
+		},
+		{
+			"src": "\/android-chrome-512x512.png",
+			"sizes": "512x512",
+			"type": "image\/png"
+		}
+	],
+	"theme_color": "#ffffff",
+	"display": "standalone"
+}
diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg
new file mode 100644
index 000000000..bcef6b1c7
--- /dev/null
+++ b/public/safari-pinned-tab.svg
@@ -0,0 +1,51 @@
+<?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="4155.000000pt" height="4155.000000pt" viewBox="0 0 4155.000000 4155.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,4155.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M20235 41544 c-450 -15 -884 -39 -1240 -69 -2929 -250 -5740 -1108
+-8305 -2533 -3385 -1882 -6200 -4697 -8082 -8082 -1492 -2685 -2362 -5641
+-2563 -8710 -33 -506 -39 -733 -39 -1375 0 -642 6 -869 39 -1375 201 -3069
+1071 -6025 2563 -8710 1882 -3385 4697 -6200 8082 -8082 2685 -1492 5641
+-2362 8710 -2563 506 -33 733 -39 1375 -39 642 0 869 6 1375 39 3069 201 6025
+1071 8710 2563 3385 1882 6200 4697 8082 8082 1492 2685 2362 5641 2563 8710
+33 506 39 733 39 1375 0 642 -6 869 -39 1375 -201 3069 -1071 6025 -2563 8710
+-1882 3385 -4697 6200 -8082 8082 -2705 1503 -5694 2377 -8785 2568 -410 25
+-614 31 -1160 34 -319 2 -625 2 -680 0z m15300 -12754 c-18 -8 -1074 -303
+-6325 -1764 -663 -184 -2597 -722 -4297 -1195 -1768 -492 -3156 -874 -3240
+-890 -468 -93 -1068 -114 -1593 -55 -163 18 -394 57 -503 85 -44 11 -1583 439
+-3421 950 -1837 512 -3744 1042 -4236 1179 -3708 1032 -6075 1692 -6079 1696
+-2 2 6682 4 14855 3 8853 0 14851 -4 14839 -9z m392 -14256 c-5 -5 -11977
+5190 -11977 5197 0 3 737 462 1637 1020 900 558 3594 2227 5987 3710 l4351
+2696 3 -6310 c1 -3471 1 -6312 -1 -6313z m-24275 8906 c3188 -2038 5793 -3708
+5789 -3712 -3 -4 -614 -279 -1356 -612 -743 -332 -3348 -1498 -5790 -2591
+-2442 -1093 -4446 -1989 -4452 -1992 -10 -4 -13 1261 -13 6307 0 5193 2 6311
+13 6308 7 -2 2621 -1670 5809 -3708z m-117 2635 c1711 -514 3117 -937 3125
+-941 9 -3 -20 -19 -73 -40 -424 -164 -777 -477 -967 -859 -63 -128 -121 -288
+-141 -395 -6 -36 -13 -66 -15 -68 -1 -2 -382 239 -846 536 -463 296 -1601
+1024 -2528 1616 -927 593 -1689 1082 -1695 1088 -7 7 -4 8 10 4 11 -3 1420
+-426 3130 -941z m21460 931 c-73 -50 -5048 -3227 -5057 -3229 -6 -1 -17 29
+-25 68 -68 330 -266 665 -535 903 -157 138 -369 268 -560 343 -49 19 -88 36
+-88 39 0 5 6245 1887 6270 1889 10 1 8 -3 -5 -13z m-15065 -2855 c1174 -352
+1209 -361 1655 -431 613 -95 1271 -109 1940 -39 270 28 719 111 946 174 94 26
+1983 593 2006 602 7 3 -12 -35 -43 -83 -108 -173 -186 -367 -226 -567 -32
+-158 -32 -434 1 -587 60 -285 176 -523 365 -748 132 -157 331 -319 515 -420
+84 -45 84 -46 61 -61 -13 -9 -588 -377 -1279 -818 l-1254 -801 -51 21 c-206
+84 -579 192 -821 236 -366 67 -580 85 -1035 85 -471 1 -715 -19 -1085 -90
+-252 -48 -630 -158 -792 -229 l-54 -24 -1278 816 -1279 817 104 61 c161 93
+258 169 394 305 245 245 388 504 462 832 20 90 23 130 23 313 0 226 -12 312
+-71 493 -32 99 -119 281 -178 372 -25 39 -46 72 -46 75 0 2 12 0 28 -5 15 -5
+461 -140 992 -299z m3100 -4671 c317 -23 594 -80 815 -169 66 -27 1126 -493
+2355 -1036 1229 -543 3405 -1504 4835 -2135 1430 -631 3409 -1505 4398 -1941
+l1798 -794 -68 -21 c-37 -12 -113 -29 -168 -38 -92 -15 -1190 -16 -14345 -14
+l-14245 3 -85 23 c-47 12 -100 27 -119 34 l-34 11 24 12 c21 11 3821 1690
+6519 2880 465 205 2175 960 3801 1678 1625 718 2982 1316 3015 1330 211 89
+527 156 819 176 177 12 520 12 685 1z"/>
+</g>
+</svg>
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index 36d5ea754..72a7abc05 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -19,6 +19,17 @@
     <meta property="og:image" content="{{ SITE_URL }}/images/round_logo.png"/>
     <meta property="og:description" content="Simple, Intuitive Invoicing."/>
 
+    <!-- http://realfavicongenerator.net -->
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ url('apple-touch-icon.png') }}">
+    <link rel="icon" type="image/png" href="{{ url('favicon-32x32.png') }}" sizes="32x32">
+    <link rel="icon" type="image/png" href="{{ url('favicon-16x16.png') }}" sizes="16x16">
+    <link rel="manifest" href="{{ url('manifest.json') }}">
+    <link rel="mask-icon" href="{{ url('safari-pinned-tab.svg') }}" color="#3bc65c">
+    <link rel="shortcut icon" href="{{ url('favicon.ico') }}">
+    <meta name="apple-mobile-web-app-title" content="Invoice Ninja">
+    <meta name="application-name" content="Invoice Ninja">
+    <meta name="theme-color" content="#ffffff">
+
     <!-- http://stackoverflow.com/questions/19012698/browser-cache-issues-in-laravel-4-application -->
     <meta http-equiv="cache-control" content="max-age=0"/>
     <meta http-equiv="cache-control" content="no-cache"/>
@@ -32,7 +43,6 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="msapplication-config" content="none"/>
-
     <link rel="canonical" href="{{ NINJA_APP_URL }}/{{ Request::path() }}"/>
 
     <script src="{{ asset('built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>