diff --git a/public/404.html b/public/404.html
index e493a11..d662b93 100644
--- a/public/404.html
+++ b/public/404.html
@@ -54,7 +54,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
index f9c2e67..25c882c 100644
--- a/public/browserconfig.xml
+++ b/public/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
+            <square150x150logo src="/images/mstile-150x150.png"/>
             <TileColor>#2b5797</TileColor>
         </tile>
     </msapplication>
diff --git a/public/categories/index.html b/public/categories/index.html
index 3f89a6c..cf5ac8f 100644
--- a/public/categories/index.html
+++ b/public/categories/index.html
@@ -54,7 +54,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/static/android-chrome-192x192.png b/public/images/android-chrome-192x192.png
similarity index 100%
rename from static/android-chrome-192x192.png
rename to public/images/android-chrome-192x192.png
diff --git a/static/apple-touch-icon.png b/public/images/apple-touch-icon.png
similarity index 100%
rename from static/apple-touch-icon.png
rename to public/images/apple-touch-icon.png
diff --git a/public/images/favicon-16x16.png b/public/images/favicon-16x16.png
index 7cbd047..4997de5 100644
Binary files a/public/images/favicon-16x16.png and b/public/images/favicon-16x16.png differ
diff --git a/public/images/favicon-32x32.png b/public/images/favicon-32x32.png
index 99648e8..0686e50 100644
Binary files a/public/images/favicon-32x32.png and b/public/images/favicon-32x32.png differ
diff --git a/static/mstile-150x150.png b/public/images/mstile-150x150.png
similarity index 100%
rename from static/mstile-150x150.png
rename to public/images/mstile-150x150.png
diff --git a/static/safari-pinned-tab.svg b/public/images/safari-pinned-tab.svg
similarity index 100%
rename from static/safari-pinned-tab.svg
rename to public/images/safari-pinned-tab.svg
diff --git a/public/index.html b/public/index.html
index af875c1..1612042 100644
--- a/public/index.html
+++ b/public/index.html
@@ -54,7 +54,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/position/coolblue/index.html b/public/position/coolblue/index.html
index 3d99e91..adec099 100644
--- a/public/position/coolblue/index.html
+++ b/public/position/coolblue/index.html
@@ -58,7 +58,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/position/index.html b/public/position/index.html
index acae67c..1292d06 100644
--- a/public/position/index.html
+++ b/public/position/index.html
@@ -54,7 +54,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/position/itcreation/index.html b/public/position/itcreation/index.html
index d9c0d4b..210fcd2 100644
--- a/public/position/itcreation/index.html
+++ b/public/position/itcreation/index.html
@@ -58,7 +58,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/position/personal/index.html b/public/position/personal/index.html
index 821fbcf..ac885ef 100644
--- a/public/position/personal/index.html
+++ b/public/position/personal/index.html
@@ -58,7 +58,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/position/skills/index.html b/public/position/skills/index.html
index 3e81dee..9c5ebce 100644
--- a/public/position/skills/index.html
+++ b/public/position/skills/index.html
@@ -58,7 +58,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/position/thyssenkrupp/index.html b/public/position/thyssenkrupp/index.html
index 6810da2..3219d70 100644
--- a/public/position/thyssenkrupp/index.html
+++ b/public/position/thyssenkrupp/index.html
@@ -58,7 +58,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/post/freebsd_jail_jumphost/index.html b/public/post/freebsd_jail_jumphost/index.html
index 8810acf..04a5fb1 100644
--- a/public/post/freebsd_jail_jumphost/index.html
+++ b/public/post/freebsd_jail_jumphost/index.html
@@ -58,7 +58,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/post/index.html b/public/post/index.html
index befb992..e3f6d0b 100644
--- a/public/post/index.html
+++ b/public/post/index.html
@@ -54,7 +54,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/post/rundeck_331_mysql/index.html b/public/post/rundeck_331_mysql/index.html
index a9a891f..f00d549 100644
--- a/public/post/rundeck_331_mysql/index.html
+++ b/public/post/rundeck_331_mysql/index.html
@@ -58,7 +58,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/series/index.html b/public/series/index.html
index 2eb8fe6..7ba5994 100644
--- a/public/series/index.html
+++ b/public/series/index.html
@@ -54,7 +54,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/site.webmanifest b/public/site.webmanifest
index 94026b4..9815ddd 100644
--- a/public/site.webmanifest
+++ b/public/site.webmanifest
@@ -3,7 +3,7 @@
     "short_name": "/usr/home/simon",
     "icons": [
         {
-            "src": "/android-chrome-192x192.png",
+            "src": "/images/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         }
diff --git a/public/status/index.html b/public/status/index.html
index 3928ad5..0dcfbc5 100644
--- a/public/status/index.html
+++ b/public/status/index.html
@@ -58,7 +58,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/public/tags/index.html b/public/tags/index.html
index 4e243f3..c72e6d4 100644
--- a/public/tags/index.html
+++ b/public/tags/index.html
@@ -54,7 +54,7 @@
 
     
 
-        
+    
 
     <link rel="apple-touch-icon" sizes="180x180" href="https://simoncor.net/images/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="https://simoncor.net/images/favicon-32x32.png">
diff --git a/static/browserconfig.xml b/static/browserconfig.xml
index f9c2e67..25c882c 100644
--- a/static/browserconfig.xml
+++ b/static/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
+            <square150x150logo src="/images/mstile-150x150.png"/>
             <TileColor>#2b5797</TileColor>
         </tile>
     </msapplication>
diff --git a/static/favicon-16x16.png b/static/favicon-16x16.png
deleted file mode 100644
index 4997de5..0000000
Binary files a/static/favicon-16x16.png and /dev/null differ
diff --git a/static/favicon-32x32.png b/static/favicon-32x32.png
deleted file mode 100644
index 0686e50..0000000
Binary files a/static/favicon-32x32.png and /dev/null differ
diff --git a/static/images/android-chrome-192x192.png b/static/images/android-chrome-192x192.png
new file mode 100644
index 0000000..26f149f
Binary files /dev/null and b/static/images/android-chrome-192x192.png differ
diff --git a/static/images/apple-touch-icon.png b/static/images/apple-touch-icon.png
new file mode 100644
index 0000000..02b1f7e
Binary files /dev/null and b/static/images/apple-touch-icon.png differ
diff --git a/static/images/favicon-16x16.png b/static/images/favicon-16x16.png
index 7cbd047..4997de5 100644
Binary files a/static/images/favicon-16x16.png and b/static/images/favicon-16x16.png differ
diff --git a/static/images/favicon-32x32.png b/static/images/favicon-32x32.png
index 99648e8..0686e50 100644
Binary files a/static/images/favicon-32x32.png and b/static/images/favicon-32x32.png differ
diff --git a/static/images/mstile-150x150.png b/static/images/mstile-150x150.png
new file mode 100644
index 0000000..e78c947
Binary files /dev/null and b/static/images/mstile-150x150.png differ
diff --git a/static/images/safari-pinned-tab.svg b/static/images/safari-pinned-tab.svg
new file mode 100644
index 0000000..f35bc95
--- /dev/null
+++ b/static/images/safari-pinned-tab.svg
@@ -0,0 +1,18 @@
+<?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="200.000000pt" height="200.000000pt" viewBox="0 0 200.000000 200.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M875 1993 c-348 -46 -656 -278 -790 -594 -96 -222 -109 -488 -35
+-709 23 -72 80 -193 92 -198 4 -2 8 -8 8 -13 0 -37 160 -212 263 -287 84 -63
+235 -135 327 -157 143 -35 358 -42 465 -15 147 36 296 105 404 185 67 50 241
+247 241 272 0 6 6 16 14 22 17 14 82 165 97 225 41 162 47 357 14 496 -90 385
+-389 677 -775 760 -56 12 -270 21 -325 13z"/>
+</g>
+</svg>
diff --git a/static/site.manifest b/static/site.manifest
deleted file mode 100644
index 9c9ee69..0000000
--- a/static/site.manifest
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "name": "/usr/home/simon",
-    "short_name": "/usr/home/simon",
-    "icons": [
-        {
-            "src": "/android-chrome-36x36.png",
-            "sizes": "36x36",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-48x48.png",
-            "sizes": "48x48",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-72x72.png",
-            "sizes": "72x72",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-96x96.png",
-            "sizes": "96x96",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-144x144.png",
-            "sizes": "144x144",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-256x256.png",
-            "sizes": "256x256",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-384x384.png",
-            "sizes": "384x384",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-512x512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
-}
diff --git a/static/site.webmanifest b/static/site.webmanifest
index 94026b4..9815ddd 100644
--- a/static/site.webmanifest
+++ b/static/site.webmanifest
@@ -3,7 +3,7 @@
     "short_name": "/usr/home/simon",
     "icons": [
         {
-            "src": "/android-chrome-192x192.png",
+            "src": "/images/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         }
diff --git a/themes/hugo-coder/layouts/_default/baseof.html b/themes/hugo-coder/layouts/_default/baseof.html
index 2f87dc7..8bcbb93 100644
--- a/themes/hugo-coder/layouts/_default/baseof.html
+++ b/themes/hugo-coder/layouts/_default/baseof.html
@@ -80,11 +80,11 @@
       {{ end }}
     {{ end }}
 
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-    <link rel="manifest" href="/site.webmanifest">
-    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+    <link rel="apple-touch-icon" sizes="180x180" href="/images/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
+    <link rel="manifest" href="/images/site.webmanifest">
+    <link rel="mask-icon" href="/images/safari-pinned-tab.svg" color="#5bbad5">
     <meta name="msapplication-TileColor" content="#2b5797">
     <meta name="theme-color" content="#ffffff">