diff --git a/.stylelintrc b/.stylelintrc
index ca56f01e..65d5bbb2 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -8,7 +8,9 @@
     "block-closing-brace-empty-line-before": null,
     "block-closing-brace-newline-after": null,
     "block-opening-brace-space-before": null,
-    "color-named": null,
+    "color-hex-case": "lower",
+    "color-hex-length": "short",
+    "color-named": "never",
     "declaration-block-semicolon-newline-after": "always-multi-line",
     "declaration-block-semicolon-newline-before": "never-multi-line",
     "declaration-block-semicolon-space-after": "always-single-line",
@@ -49,6 +51,7 @@
     "selector-max-universal": 1,
     "selector-no-qualifying-type": null,
     "selector-no-vendor-prefix": null,
+    "shorthand-property-no-redundant-values": true,
     "string-quotes": "double",
     "value-keyword-case": "lower",
     "value-list-comma-newline-after": "never-multi-line",
diff --git a/index.js b/index.js
index c7f1c4ff..8ef1b5b3 100644
--- a/index.js
+++ b/index.js
@@ -118,6 +118,22 @@ const REFERRER_HEADER = 'no-referrer, strict-origin-when-cross-origin';
       }
     });
 
+    server.route({
+      method: 'GET',
+      path: '/favicon.ico',
+      handler: (request, h) => {
+        return h.redirect('/favicons/favicon.ico').permanent();
+      }
+    });
+
+    server.route({
+      method: 'GET',
+      path: '/apple-touch-icon.png',
+      handler: (request, h) => {
+        return h.redirect('/favicons/apple-touch-icon.png').permanent();
+      }
+    });
+
     await server.start();
     console.log(`Server running at: ${server.info.uri}`);
   } catch (error) {
diff --git a/public/badge/badge.css b/public/badge/badge.css
index 734b41a0..054b66a0 100644
--- a/public/badge/badge.css
+++ b/public/badge/badge.css
@@ -8,7 +8,7 @@
 }
 
 .sri-test::before {
-  background-color: yellow;
+  background-color: #ff0;
   content: "[Testing SRI support...]";
 }
 
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index f89eadb1..00000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/favicons/android-chrome-192x192.png b/public/favicons/android-chrome-192x192.png
new file mode 100644
index 00000000..982fd469
Binary files /dev/null and b/public/favicons/android-chrome-192x192.png differ
diff --git a/public/favicons/android-chrome-512x512.png b/public/favicons/android-chrome-512x512.png
new file mode 100644
index 00000000..9c571e23
Binary files /dev/null and b/public/favicons/android-chrome-512x512.png differ
diff --git a/public/favicons/apple-touch-icon.png b/public/favicons/apple-touch-icon.png
new file mode 100644
index 00000000..9f8300d3
Binary files /dev/null and b/public/favicons/apple-touch-icon.png differ
diff --git a/public/favicons/browserconfig.xml b/public/favicons/browserconfig.xml
new file mode 100644
index 00000000..a2f2185c
--- /dev/null
+++ b/public/favicons/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square150x150logo src="/favicons/mstile-150x150.png"/>
+      <TileColor>#333333</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>
diff --git a/public/favicons/favicon-16x16.png b/public/favicons/favicon-16x16.png
new file mode 100644
index 00000000..c2b4d505
Binary files /dev/null and b/public/favicons/favicon-16x16.png differ
diff --git a/public/favicons/favicon-32x32.png b/public/favicons/favicon-32x32.png
new file mode 100644
index 00000000..54b5bd31
Binary files /dev/null and b/public/favicons/favicon-32x32.png differ
diff --git a/public/favicons/favicon.ico b/public/favicons/favicon.ico
new file mode 100644
index 00000000..cc519a0e
Binary files /dev/null and b/public/favicons/favicon.ico differ
diff --git a/public/favicons/manifest.json b/public/favicons/manifest.json
new file mode 100644
index 00000000..ed538edd
--- /dev/null
+++ b/public/favicons/manifest.json
@@ -0,0 +1,19 @@
+{
+  "name": "SRI Hash Generator",
+  "short_name": "SRI Hash",
+  "icons": [
+    {
+      "src": "/favicons/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/favicons/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#333333",
+  "background_color": "#333333",
+  "display": "standalone"
+}
diff --git a/public/favicons/mstile-150x150.png b/public/favicons/mstile-150x150.png
new file mode 100644
index 00000000..6225584e
Binary files /dev/null and b/public/favicons/mstile-150x150.png differ
diff --git a/public/favicons/safari-pinned-tab.svg b/public/favicons/safari-pinned-tab.svg
new file mode 100644
index 00000000..5b86f4fc
--- /dev/null
+++ b/public/favicons/safari-pinned-tab.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1365.333" height="1365.333" version="1.0" viewBox="0 0 1024 1024"><path d="M500.7 11.5c-6.2 6-12.8 12.1-14.6 13.5-1.8 1.4-5 3.8-7.1 5.5-2 1.6-4.7 3.7-5.9 4.5-3 2-12.3 8.8-13.7 9.9-.7.6-1.4.7-1.8.4-.3-.3-.8.2-1.2 1.1-.3.9-1.2 1.6-1.9 1.6s-2.3.8-3.6 1.9c-2.6 1.9-13.2 8.1-18.9 10.9-1.9.9-3.7 2-4 2.3-.5.5-7 3.7-23 11.2-3.6 1.7-6.7 3.2-7 3.2-.3.1-2.3.9-4.5 1.9-6.7 3-34.4 13.5-44 16.6-15.7 5.1-24.9 8-27 8.3-1.1.1-2.4.5-3 .8-.8.5-6.8 2.1-12.5 3.4-.3.1-2.3.7-4.5 1.3-2.2.6-5.1 1.3-6.5 1.6-1.4.2-2.5.5-2.5.6 0 .1-.9.3-1.9.5-1.1.2-4.9 1.1-8.5 1.9-3.7.9-7.7 1.8-9.1 2-1.4.2-4.5.9-7 1.5-2.5.5-5.8 1.2-7.5 1.5-2.8.6-4.7.9-10.5 2.1-1.4.2-4.7.7-7.5 1.1-2.7.3-5.5 1-6.1 1.5-.6.5-1.3.6-1.6.4-.3-.3-3.6-.1-7.4.5-3.8.6-8.5 1.3-10.4 1.6-1.9.2-5.3.7-7.5 1-4.8.8-8.2 1.2-15.4 1.9-3 .3-7.3.7-9.5 1-2.3.3-7.2.7-11.1 1-3.8.3-9.7.7-13 1-3.3.3-12.1.7-19.5 1-7.4.2-13.7.5-14 .5-.3.1-3.6.1-7.3.1l-6.9-.1.7 34.8c.8 44.1 1.2 55.2 1.9 55.9.3.3.1 1.3-.4 2.3-.5 1-.6 2-.3 2.4.4.4.8 3.5.9 6.9.4 10 1.4 26.8 1.9 32.2.2 2.7.7 8.6 1 13 .8 10.7 1.5 20.2 1.9 24.5.2 1.9.7 6.9 1.1 11 .3 4.1.8 9.1 1.1 11 .2 1.9.6 6 .9 9 .3 3 .8 7.3 1.1 9.5.3 2.2.7 5.6.9 7.6 1 9 2.4 20.2 3.1 23.9.3 1.4.7 4.2.9 6.4.6 4.9 3.4 24.1 4.1 28.1.4 1.6.7 3.7.8 4.5.9 6.5 2.2 14.1 3.6 21 .6 3 1.3 6.7 1.5 8.2.3 1.6.7 4 1 5.5.4 2.4 1.1 6.4 2.8 14.8.7 3.1 1.7 8.9 1.8 9.7 0 .4.4 2.2.9 3.9.5 1.8 1.2 5 1.6 7.3.3 2.2 1 4.8 1.5 5.8s.8 1.8.5 1.8c-.2 0 0 1.7.5 3.7.5 2.1 1.2 4.9 1.4 6.3.3 1.4.8 3.6 1.2 5 .4 1.4.8 3.2.9 4 .2.8.8 3.3 1.4 5.5.6 2.2 1.2 4.7 1.4 5.5 4.4 17.4 7.3 28 10.6 39.5 2.3 7.7 4.3 14.4 4.4 15 .2.5.5 1.7.8 2.5 2.3 6.8 9 28.4 9.2 29.4.1 1 1.8 5.6 3.6 10.1.5 1.1 1.9 5.1 3.2 9 1.3 3.8 2.5 7.2 2.8 7.5.3.3.6 1.2.8 2 .3 1.5 3.6 10.7 5.3 14.5 2.4 5.6 6.1 15.2 6.4 16.6.2.9.8 2.5 1.4 3.5 1.4 2.5 6.3 13.6 6.5 14.9.1.5 1.3 3.2 2.6 6 1.2 2.7 3.3 7.2 4.6 10 5.3 11.7 21.7 45 22.3 45.5.7.4 2.1 3.6 2.3 5 .1.3 1.2 2.2 2.4 4.2 1.3 2.1 2.4 4 2.4 4.4 0 .3 1.4 2.6 3 5.1 1.7 2.4 3 5.1 3 5.9 0 .7.4 1.4.9 1.4s1.1.8 1.4 1.8c.7 1.9 1.6 3.4 14.7 24.2 5.2 8.3 9.9 16 10.5 17.1.5 1 1.3 1.9 1.7 1.9.5 0 .8.6.8 1.4 0 .8.4 1.6.8 1.8.4.2 2.8 3.2 5.2 6.8 3.8 5.4 7.3 10.4 11.8 16.5.4.6 2.4 3.1 4.5 5.7 2 2.5 3.7 4.9 3.7 5.2 0 .5 2.4 3.6 5.5 7 .6.6 2.6 3.1 4.5 5.6 1.9 2.4 4.2 5.2 5 6.1.8.8 3.3 3.7 5.5 6.4 12.6 15.2 35.6 39.1 51.3 53.4 12.6 11.4 14.7 13.3 27.2 23.2 6.9 5.5 13.2 10.6 14 11.3.8.7 5.3 3.9 10 7.2 4.7 3.2 8.7 6.1 9 6.4.3.3 1.7 1.1 3.3 1.9 1.5.8 2.7 1.8 2.7 2.3 0 .4.4.8 1 .8.5 0 4.1 2 8 4.5 3.9 2.5 7.5 4.5 8 4.5.6 0 1 .4 1 .9s.8 1.1 1.8 1.5c.9.3 5.3 2.6 9.7 5.1 4.4 2.4 9.1 5 10.5 5.5 1.4.6 4.3 2 6.5 3.1 2.1 1.2 7.1 3.4 11.1 4.9 7.3 2.9 9.3 3 14.4.3 1.4-.7 3.1-1.3 3.8-1.3.6 0 1.2-.5 1.2-1.2 0-.6.3-.8.6-.5.4.4 7.5-2.9 15.8-7.2 19.3-10 21.6-11.2 24-13.3 1.1-1 2.3-1.8 2.7-1.8.7 0 13.5-8.1 15.4-9.8.6-.5 2.4-1.7 4-2.7 5.4-3.4 22-15.8 22.3-16.7.2-.4.8-.8 1.4-.8.6 0 1.8-.8 2.7-1.8.9-.9 4.8-4.3 8.7-7.4 7.6-6 14.7-12.2 20.2-17.5 1.9-1.8 3.6-3.3 3.8-3.3 1.4 0 35.4-35.4 47.1-49 2.1-2.4 4.6-5.2 5.6-6.2.9-1 1.4-1.8 1.1-1.8-.3 0 .1-.6.8-1.4.8-.7 3-3.3 4.9-5.6 1.8-2.3 3.9-4.7 4.4-5.4.6-.6 2.3-2.9 3.9-5.1 1.7-2.2 3.3-4.2 3.6-4.5.3-.3 1.7-2.1 3-4s2.9-4 3.5-4.6c.5-.6 1.6-2 2.3-3 .7-1.1 4.4-6.4 8.2-11.9 3.9-5.5 7.6-10.8 8.2-11.9.7-1 2.1-2.9 3.1-4.1.9-1.3 1.7-2.8 1.7-3.4 0-.6.4-1.1.9-1.1s1.4-1.4 2.1-3.1c.7-1.7 1.8-3.6 2.5-4.2 1.6-1.7 10.5-16.5 10.5-17.6 0-.5.4-1.1.9-1.3.4-.1 3.1-4.4 5.9-9.3 2.7-5 6.2-11 7.6-13.5 1.4-2.5 6.3-11.9 10.8-21 4.6-9.1 8.6-16.7 9.1-16.8.4-.2.7-.8.7-1.3s1.5-3.9 3.2-7.6c1.8-3.8 3.3-7 3.4-7.3 0-.3 1.5-3.7 3.3-7.5 1.8-3.9 4.4-9.7 5.8-13 1.4-3.3 3.3-7.8 4.3-10 .9-2.2 3.8-9.4 6.5-16 2.6-6.6 5.1-12.9 5.5-14 3.5-8.3 19.5-55.2 20.2-59.1.2-1 .5-2.1.9-2.4.3-.3 1.5-4.1 2.7-8.5 1.3-4.4 3-10.5 3.8-13.5.9-3 1.8-6.2 2-7 .2-.8 1-3.6 1.8-6.3.8-2.6 1.2-4.7.9-4.7-.3 0 0-.6.6-1.4.6-.8 1.1-1.8 1-2.2-.2-.5.4-2.9 1.1-5.4 1.5-5 1.6-5.4 2.3-9 .3-1.4.8-3.2 1.1-4 .3-.8.8-2.6 1-4 .3-1.4 1.5-6.3 2.6-11 2-8.6 5.8-25.6 6.5-29.2.2-1.1.6-2.7.9-3.6.8-2.7 1.8-7.5 2-10.2.1-1.4.5-3.6.9-5s.9-3.6 1.1-5c.3-1.4.9-5 1.5-8s1.3-6.9 1.6-8.5c1.2-7.3 1.6-9.3 2.5-14 .6-2.8 1.2-6.8 1.5-9 .2-2.2.7-5.1 1-6.5.2-1.4.7-3.9.9-5.5 1.4-9.5 1.8-12.3 2.3-15 .3-1.7.6-5 .8-7.5.2-2.5.5-4.5.5-4.5.4 0 4-27.8 4.5-34 .2-2.8.6-6.4.9-8 .3-1.7.8-6.2 1.1-10 .4-3.9.8-8.8 1.1-11 .3-2.2.7-6.9 1-10.5.2-3.6.7-9 .9-12 2.1-23.9 2.2-25.7 4.1-60.5.9-18.8 1.3-30 1.9-64.2l.6-35.1-9.8-.2c-17.5-.3-38.8-1.3-50.3-2.5-1.9-.2-6.6-.6-10.3-.9-3.7-.4-8.2-.8-10-1.1-1.8-.2-5.7-.7-8.7-1-3-.3-6.6-.7-8-1-1.4-.2-4.5-.6-7-.9-7.3-.9-11-1.5-20-3.1-4.7-.8-9.2-1.6-10-1.6-.8-.1-3.3-.5-5.5-1-2.2-.4-5.3-1-7-1.3-2.7-.5-14.3-2.9-20.5-4.2-1.4-.3-8.1-1.9-15-3.6-6.8-1.7-12.9-3.1-13.5-3.3-.5-.1-1.7-.4-2.5-.7-1.5-.5-23.6-6.8-25.5-7.3-.5-.1-1.7-.5-2.5-.8-.8-.3-7.8-2.6-15.5-5.1-13.4-4.5-22.2-7.7-31.2-11.7-2.4-1.1-4.5-1.9-4.7-1.9-.2 0-2.6-1-5.3-2.2-2.6-1.2-5-2.2-5.3-2.3-3.8-1.3-28.9-13.7-35-17.3-1.9-1.1-5.7-3.3-8.5-4.8-2.7-1.5-6.4-3.7-8.1-5-1.7-1.3-3.6-2.4-4.2-2.4-.7 0-1.2-.5-1.2-1 0-.6-.4-1-1-1-1.2 0-16.5-10.7-23.5-16.4-2.7-2.3-5.8-4.8-6.9-5.6-1.1-.8-6.8-6.2-12.7-12L512.1.5l-11.4 11z"/></svg>
\ No newline at end of file
diff --git a/public/style.css b/public/style.css
index d59c742a..2c6f276f 100644
--- a/public/style.css
+++ b/public/style.css
@@ -4,7 +4,7 @@
 
 body {
   color: #333;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-size: 16px;
   font-weight: 300;
   line-height: 1.5;
@@ -54,9 +54,10 @@ code {
   word-break: break-all;
   display: inline-block;
   padding: 1rem;
-  border-left: 3px solid gray;
+  border-left: 3px solid #808080;
   background-color: #3a3a3a;
   color: #ccc;
+  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   font-size: 1rem;
   line-height: 1;
   margin-top: 1rem;
@@ -64,16 +65,18 @@ code {
 
 nav {
   background-color: #333;
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
 }
 
 nav a {
-  color: white;
+  color: #fff;
   float: right;
-  padding: 0.5rem 1rem 0.5rem 0;
+  padding: 0.5rem 1rem;
 }
 
 nav a:hover {
-  color: white;
+  color: #fff;
 }
 
 footer {
@@ -84,9 +87,8 @@ footer {
 .container {
   width: auto;
   max-width: 960px;
-  margin: auto;
+  margin: auto auto 2rem;
   padding: 1rem;
-  margin-bottom: 2rem;
 }
 
 .clear {
@@ -97,7 +99,7 @@ footer {
  * App container
  */
 #app {
-  color: black;
+  color: #000;
   background-color: #adbdc6;
   padding: 4rem 0;
   max-width: 100%;
@@ -110,14 +112,14 @@ footer {
   font-size: 1.5rem;
 }
 
-#sriApp input:not([type="checkbox"]) {
+#sriApp input {
   font-size: 0.9rem;
   height: 2.25rem;
   display: inline-block;
 }
 
 #sriApp input[type="url"] {
-  background-color: white;
+  background-color: #fff;
   color: #888;
   border: 1px solid #ccc;
   width: 70%;
@@ -126,7 +128,7 @@ footer {
 
 #sriApp input[type="submit"] {
   cursor: pointer;
-  color: white;
+  color: #fff;
   background-color: #008cba;
   border: 1px solid #0079a1;
   width: 25%;
@@ -142,9 +144,9 @@ footer {
   height: 5rem;
   padding: 1rem;
   border: none;
-  border-left: 3px solid gray;
+  border-left: 3px solid #808080;
   background-color: #3a3a3a;
-  margin: 1rem 0 0 0;
+  margin: 1rem 0 0;
 }
 
 #sriSnippet {
@@ -158,7 +160,7 @@ footer {
  * Mobile styling
  */
 
-@media all and (max-width: 960px) {
+@media (max-width: 960px) {
   nav {
     padding: 0.75rem 0;
     text-align: center;
@@ -178,7 +180,7 @@ footer {
   }
 
   #app {
-    padding: 1rem 0 0.25rem 0;
+    padding: 1rem 0 0.25rem;
     text-align: center;
   }
 
diff --git a/templates/index.html b/templates/index.html
index c4525974..b998d539 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,7 +13,18 @@
     <link rel="stylesheet" href="/badge/badge.css" integrity="{{sri './public/badge/badge.css'}}">
     <link rel="stylesheet" href="/badge/will-pass.css">
     <link rel="stylesheet" href="/badge/must-fail.css" integrity="sha384-INVALIDHASH">
-    <link rel="icon" href="/favicon.ico" type="image/x-icon">
+
+    <link rel="apple-touch-icon" href="/favicons/apple-touch-icon.png" sizes="180x180">
+    <link rel="icon" href="/favicons/favicon-32x32.png" sizes="32x32" type="image/png">
+    <link rel="icon" href="/favicons/favicon-16x16.png" sizes="16x16" type="image/png">
+    <link rel="manifest" href="/favicons/manifest.json">
+    <link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#333333">
+    <link rel="shortcut icon" href="/favicons/favicon.ico">
+    <meta name="apple-mobile-web-app-title" content="SRI Hash Generator">
+    <meta name="application-name" content="SRI Hash Generator">
+    <meta name="msapplication-TileColor" content="#333333">
+    <meta name="msapplication-config" content="/favicons/browserconfig.xml">
+    <meta name="theme-color" content="#333333">
   </head>
   <body>
     <!-- Nav -->