diff --git a/data/android-chrome-192x192.png b/data/favicons/android-chrome-192x192.png
similarity index 98%
rename from data/android-chrome-192x192.png
rename to data/favicons/android-chrome-192x192.png
index 3c6ded9f..3fb39a90 100644
Binary files a/data/android-chrome-192x192.png and b/data/favicons/android-chrome-192x192.png differ
diff --git a/data/android-chrome-256x256.png b/data/favicons/android-chrome-256x256.png
similarity index 99%
rename from data/android-chrome-256x256.png
rename to data/favicons/android-chrome-256x256.png
index 446c026f..3200a2c1 100644
Binary files a/data/android-chrome-256x256.png and b/data/favicons/android-chrome-256x256.png differ
diff --git a/data/apple-touch-icon-120x120.png b/data/favicons/apple-touch-icon-120x120.png
similarity index 97%
rename from data/apple-touch-icon-120x120.png
rename to data/favicons/apple-touch-icon-120x120.png
index e14bd8a2..50a625ee 100644
Binary files a/data/apple-touch-icon-120x120.png and b/data/favicons/apple-touch-icon-120x120.png differ
diff --git a/data/apple-touch-icon-152x152.png b/data/favicons/apple-touch-icon-152x152.png
similarity index 97%
rename from data/apple-touch-icon-152x152.png
rename to data/favicons/apple-touch-icon-152x152.png
index 85b6e0b1..14e0c2f9 100644
Binary files a/data/apple-touch-icon-152x152.png and b/data/favicons/apple-touch-icon-152x152.png differ
diff --git a/data/apple-touch-icon-180x180.png b/data/favicons/apple-touch-icon-180x180.png
similarity index 98%
rename from data/apple-touch-icon-180x180.png
rename to data/favicons/apple-touch-icon-180x180.png
index a3889d89..336835a9 100644
Binary files a/data/apple-touch-icon-180x180.png and b/data/favicons/apple-touch-icon-180x180.png differ
diff --git a/data/apple-touch-icon-60x60.png b/data/favicons/apple-touch-icon-60x60.png
similarity index 93%
rename from data/apple-touch-icon-60x60.png
rename to data/favicons/apple-touch-icon-60x60.png
index f0c535f8..511a4293 100644
Binary files a/data/apple-touch-icon-60x60.png and b/data/favicons/apple-touch-icon-60x60.png differ
diff --git a/data/apple-touch-icon-76x76.png b/data/favicons/apple-touch-icon-76x76.png
similarity index 95%
rename from data/apple-touch-icon-76x76.png
rename to data/favicons/apple-touch-icon-76x76.png
index f3b06368..f2a01488 100644
Binary files a/data/apple-touch-icon-76x76.png and b/data/favicons/apple-touch-icon-76x76.png differ
diff --git a/data/apple-touch-icon.png b/data/favicons/apple-touch-icon.png
similarity index 98%
rename from data/apple-touch-icon.png
rename to data/favicons/apple-touch-icon.png
index 9d52f138..336835a9 100644
Binary files a/data/apple-touch-icon.png and b/data/favicons/apple-touch-icon.png differ
diff --git a/data/browserconfig.xml b/data/favicons/browserconfig.xml
similarity index 83%
rename from data/browserconfig.xml
rename to data/favicons/browserconfig.xml
index fdffb57e..4c9ad6fc 100644
--- a/data/browserconfig.xml
+++ b/data/favicons/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="https://imkyle4815.github.io/cardconjurer/data/mstile-150x150.png"/>
+            <square150x150logo src="https://imkyle4815.github.io/cardconjurer/data/favicons/mstile-150x150.png"/>
             <TileColor>#00a300</TileColor>
         </tile>
     </msapplication>
diff --git a/data/favicon-16x16.png b/data/favicons/favicon-16x16.png
similarity index 80%
rename from data/favicon-16x16.png
rename to data/favicons/favicon-16x16.png
index c087f74f..d946d30d 100644
Binary files a/data/favicon-16x16.png and b/data/favicons/favicon-16x16.png differ
diff --git a/data/favicon-32x32.png b/data/favicons/favicon-32x32.png
similarity index 88%
rename from data/favicon-32x32.png
rename to data/favicons/favicon-32x32.png
index dd987197..d5e6a0c3 100644
Binary files a/data/favicon-32x32.png and b/data/favicons/favicon-32x32.png differ
diff --git a/data/favicons/favicon.ico b/data/favicons/favicon.ico
new file mode 100644
index 00000000..692317a4
Binary files /dev/null and b/data/favicons/favicon.ico differ
diff --git a/data/mstile-150x150.png b/data/favicons/mstile-150x150.png
similarity index 97%
rename from data/mstile-150x150.png
rename to data/favicons/mstile-150x150.png
index 65ff3735..2e9155fb 100644
Binary files a/data/mstile-150x150.png and b/data/favicons/mstile-150x150.png differ
diff --git a/data/safari-pinned-tab.svg b/data/favicons/safari-pinned-tab.svg
similarity index 100%
rename from data/safari-pinned-tab.svg
rename to data/favicons/safari-pinned-tab.svg
diff --git a/data/site.webmanifest b/data/favicons/site.webmanifest
similarity index 85%
rename from data/site.webmanifest
rename to data/favicons/site.webmanifest
index 52afac3e..181529a1 100644
--- a/data/site.webmanifest
+++ b/data/favicons/site.webmanifest
@@ -3,12 +3,12 @@
     "short_name": "Card Conjurer",
     "icons": [
         {
-            "src": "https://imkyle4815.github.io/cardconjurer/data/android-chrome-192x192.png",
+            "src": "https://imkyle4815.github.io/cardconjurer/data/favicons/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "https://imkyle4815.github.io/cardconjurer/data/android-chrome-256x256.png",
+            "src": "https://imkyle4815.github.io/cardconjurer/data/favicons/android-chrome-256x256.png",
             "sizes": "256x256",
             "type": "image/png"
         }
diff --git a/index.html b/index.html
index 78932f18..0c55cad3 100644
--- a/index.html
+++ b/index.html
@@ -8,15 +8,15 @@
 	<script src="data/scripts/mask.js"></script>
 	<script src="data/scripts/autocrop.js"></script>
 	<div class="title">Card Conjurer</div>
-	<!-- Please Work -->
-	<link rel="apple-touch-icon" sizes="180x180" href="https://imkyle4815.github.io/cardconjurer/data/apple-touch-icon.png">
-	<link rel="icon" type="image/png" sizes="32x32" href="https://imkyle4815.github.io/cardconjurer/data/favicon-32x32.png">
-	<link rel="icon" type="image/png" sizes="16x16" href="https://imkyle4815.github.io/cardconjurer/data/favicon-16x16.png">
-	<link rel="manifest" href="https://imkyle4815.github.io/cardconjurer/data/site.webmanifest">
-	<link rel="mask-icon" href="https://imkyle4815.github.io/cardconjurer/data/safari-pinned-tab.svg" color="#64ca2f">
-	<link rel="shortcut icon" href="https://imkyle4815.github.io/cardconjurer/data/favicon.ico">
+	<!-- Favicon craziness! -->
+	<link rel="apple-touch-icon" sizes="180x180" href="https://imkyle4815.github.io/cardconjurer/data/favicons/apple-touch-icon.png">
+	<link rel="icon" type="image/png" sizes="32x32" href="https://imkyle4815.github.io/cardconjurer/data/favicons/favicon-32x32.png">
+	<link rel="icon" type="image/png" sizes="16x16" href="https://imkyle4815.github.io/cardconjurer/data/favicons/favicon-16x16.png">
+	<link rel="manifest" href="https://imkyle4815.github.io/cardconjurer/data/favicons/site.webmanifest">
+	<link rel="mask-icon" href="https://imkyle4815.github.io/cardconjurer/data/favicons/safari-pinned-tab.svg" color="#64ca2f">
+	<link rel="shortcut icon" href="https://imkyle4815.github.io/cardconjurer/data/favicons/favicon.ico">
 	<meta name="msapplication-TileColor" content="#00a300">
-	<meta name="msapplication-config" content="https://imkyle4815.github.io/cardconjurer/data/browserconfig.xml">
+	<meta name="msapplication-config" content="https://imkyle4815.github.io/cardconjurer/data/favicons/browserconfig.xml">
 	<meta name="theme-color" content="#64ca2f">
 </head>
 <!-- <link rel="shortcut icon" href="data/background.png" /> -->