diff --git a/.gitignore b/.gitignore
index b010304..93d6571 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
 _site/
 .sass-cache/
 node_modules/
diff --git a/README.md b/README.md
index f146771..846fff9 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The official Minetest website, living at [minetest.net](http://minetest.net).
 * Uses FastClick for removing tap delay on mobile devices.
 * Smooth scrolling to sections.
 * Dynamic "back to top" button.
-* Resposnive site and favicon.
+* Responsive site and favicon.
 
 # Workflow
 
diff --git a/_includes/header.html b/_includes/header.html
index a3878b4..35da1ef 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -8,23 +8,23 @@
     <link rel="stylesheet" href="/lib/css/bootstrap.min.css">
     <link rel="stylesheet" href="/assets/css/main.min.css">
 
-    <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/favicon-194x194.png" sizes="194x194">
-    <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
+    <link rel="apple-touch-icon" sizes="57x57" href="/media/favicon/57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/media/favicon/60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/media/favicon/72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/media/favicon/76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/media/favicon/114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/media/favicon/120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/media/favicon/144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/media/favicon/152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/media/favicon/180x180.png">
+    <link rel="icon" type="image/png" sizes="32x32"   href="/media/favicon/32x32.png">
+    <link rel="icon" type="image/png" sizes="194x194" href="/media/favicon/194x194.png">
+    <link rel="icon" type="image/png" sizes="96x96"   href="/media/favicon/96x96.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="/media/favicon/192x192.png">
+    <link rel="icon" type="image/png" sizes="16x16"   href="/media/favicon/16x16.png">
     <link rel="manifest" href="/manifest.json">
     <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="msapplication-TileImage" content="/mstile-144x144.png">
+    <meta name="msapplication-TileImage" content="/media/favicon/144x144.png">
     <meta name="theme-color" content="#ffffff">
     <script type="text/javascript">
       var _paq = _paq || [];
diff --git a/android-chrome-96x96.png b/android-chrome-96x96.png
deleted file mode 100644
index b93424f..0000000
Binary files a/android-chrome-96x96.png and /dev/null differ
diff --git a/apple-touch-icon-144x144.png b/apple-touch-icon-144x144.png
deleted file mode 100644
index b7de142..0000000
Binary files a/apple-touch-icon-144x144.png and /dev/null differ
diff --git a/apple-touch-icon-72x72.png b/apple-touch-icon-72x72.png
deleted file mode 100644
index 7676411..0000000
Binary files a/apple-touch-icon-72x72.png and /dev/null differ
diff --git a/apple-touch-icon-precomposed.png b/apple-touch-icon-precomposed.png
deleted file mode 100644
index 33bd0e5..0000000
Binary files a/apple-touch-icon-precomposed.png and /dev/null differ
diff --git a/apple-touch-icon.png b/apple-touch-icon.png
deleted file mode 100644
index 22ef763..0000000
Binary files a/apple-touch-icon.png and /dev/null differ
diff --git a/browserconfig.xml b/browserconfig.xml
index c746d1d..eababea 100644
--- a/browserconfig.xml
+++ b/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="/mstile-70x70.png"/>
-      <square150x150logo src="/mstile-150x150.png"/>
-      <square310x310logo src="/mstile-310x310.png"/>
-      <wide310x150logo src="/mstile-310x150.png"/>
+      <square70x70logo src="/media/favicon/70x70.png"/>
+      <square150x150logo src="/media/favicon/150x150.png"/>
+      <square310x310logo src="/media/favicon/310x310.png"/>
+      <wide310x150logo src="/media/favicon/310x150.png"/>
       <TileColor>#f2f2f2</TileColor>
     </tile>
   </msapplication>
diff --git a/manifest.json b/manifest.json
index c0c4b90..5bd062d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,37 +2,37 @@
 	"name": "minetest.net",
 	"icons": [
 		{
-			"src": "\/android-chrome-36x36.png",
+			"src": "\/media\/favicon\/36x36.png",
 			"sizes": "36x36",
 			"type": "image\/png",
 			"density": "0.75"
 		},
 		{
-			"src": "\/android-chrome-48x48.png",
+			"src": "\/media\/favicon\/48x48.png",
 			"sizes": "48x48",
 			"type": "image\/png",
 			"density": "1.0"
 		},
 		{
-			"src": "\/android-chrome-72x72.png",
+			"src": "\/media\/favicon\/72x72.png",
 			"sizes": "72x72",
 			"type": "image\/png",
 			"density": "1.5"
 		},
 		{
-			"src": "\/android-chrome-96x96.png",
+			"src": "\/media\/favicon\/96x96.png",
 			"sizes": "96x96",
 			"type": "image\/png",
 			"density": "2.0"
 		},
 		{
-			"src": "\/android-chrome-144x144.png",
+			"src": "\/media\/favicon\/144x144.png",
 			"sizes": "144x144",
 			"type": "image\/png",
 			"density": "3.0"
 		},
 		{
-			"src": "\/android-chrome-192x192.png",
+			"src": "\/media\/favicon\/192x192.png",
 			"sizes": "192x192",
 			"type": "image\/png",
 			"density": "4.0"
diff --git a/apple-touch-icon-114x114.png b/media/favicon/114x114.png
similarity index 100%
rename from apple-touch-icon-114x114.png
rename to media/favicon/114x114.png
diff --git a/apple-touch-icon-120x120.png b/media/favicon/120x120.png
similarity index 100%
rename from apple-touch-icon-120x120.png
rename to media/favicon/120x120.png
diff --git a/android-chrome-144x144.png b/media/favicon/144x144.png
similarity index 100%
rename from android-chrome-144x144.png
rename to media/favicon/144x144.png
diff --git a/mstile-150x150.png b/media/favicon/150x150.png
similarity index 100%
rename from mstile-150x150.png
rename to media/favicon/150x150.png
diff --git a/apple-touch-icon-152x152.png b/media/favicon/152x152.png
similarity index 100%
rename from apple-touch-icon-152x152.png
rename to media/favicon/152x152.png
diff --git a/favicon-16x16.png b/media/favicon/16x16.png
similarity index 100%
rename from favicon-16x16.png
rename to media/favicon/16x16.png
diff --git a/apple-touch-icon-180x180.png b/media/favicon/180x180.png
similarity index 100%
rename from apple-touch-icon-180x180.png
rename to media/favicon/180x180.png
diff --git a/android-chrome-192x192.png b/media/favicon/192x192.png
similarity index 100%
rename from android-chrome-192x192.png
rename to media/favicon/192x192.png
diff --git a/favicon-194x194.png b/media/favicon/194x194.png
similarity index 100%
rename from favicon-194x194.png
rename to media/favicon/194x194.png
diff --git a/mstile-310x150.png b/media/favicon/310x150.png
similarity index 100%
rename from mstile-310x150.png
rename to media/favicon/310x150.png
diff --git a/mstile-310x310.png b/media/favicon/310x310.png
similarity index 100%
rename from mstile-310x310.png
rename to media/favicon/310x310.png
diff --git a/favicon-32x32.png b/media/favicon/32x32.png
similarity index 100%
rename from favicon-32x32.png
rename to media/favicon/32x32.png
diff --git a/android-chrome-36x36.png b/media/favicon/36x36.png
similarity index 100%
rename from android-chrome-36x36.png
rename to media/favicon/36x36.png
diff --git a/android-chrome-48x48.png b/media/favicon/48x48.png
similarity index 100%
rename from android-chrome-48x48.png
rename to media/favicon/48x48.png
diff --git a/apple-touch-icon-57x57.png b/media/favicon/57x57.png
similarity index 100%
rename from apple-touch-icon-57x57.png
rename to media/favicon/57x57.png
diff --git a/apple-touch-icon-60x60.png b/media/favicon/60x60.png
similarity index 100%
rename from apple-touch-icon-60x60.png
rename to media/favicon/60x60.png
diff --git a/mstile-70x70.png b/media/favicon/70x70.png
similarity index 100%
rename from mstile-70x70.png
rename to media/favicon/70x70.png
diff --git a/android-chrome-72x72.png b/media/favicon/72x72.png
similarity index 100%
rename from android-chrome-72x72.png
rename to media/favicon/72x72.png
diff --git a/apple-touch-icon-76x76.png b/media/favicon/76x76.png
similarity index 100%
rename from apple-touch-icon-76x76.png
rename to media/favicon/76x76.png
diff --git a/favicon-96x96.png b/media/favicon/96x96.png
similarity index 100%
rename from favicon-96x96.png
rename to media/favicon/96x96.png
diff --git a/mstile-144x144.png b/mstile-144x144.png
deleted file mode 100644
index 32e126f..0000000
Binary files a/mstile-144x144.png and /dev/null differ