diff --git a/_config.yml b/_config.yml
index 62953a6..17cafac 100644
--- a/_config.yml
+++ b/_config.yml
@@ -129,17 +129,21 @@ bing_webmastertools_id:    "0FB4C028ABCF07C908C54386ABD2D97F"
 #      / ____/___ __   __(_)________  ____  _____
 #     / /_  / __ `/ | / / / ___/ __ \/ __ \/ ___/
 #    / __/ / /_/ /| |/ / / /__/ /_/ / / / (__  ) 
-#   /_/    \__,_/ |___/_/\___/\____/_/ /_/____/   Favicons, Apple Touch Buttons
-#                                                 More information » http://j.mp/apple-touch-icons
+#   /_/    \__,_/ |___/_/\___/\____/_/ /_/____/   Favicon-Crap: Favicons, Chrome, Android & Apple Touch Buttons
+#                                                 More information » https://mathiasbynens.be/notes/touch-icons
 
-favicon:                         "/assets/img/favicon-32x.png"                    # iOS7 Size 32x32
-apple_touch_icon_iphone:         "/assets/img/touch-icon-iphone-60x.png"          # iOS7 Size 60x60
-apple_touch_icon_iphone_retina:  "/assets/img/touch-icon-iphone-retina-120x.png"  # iOS7 Size 120x120
-apple_touch_icon_ipad:           "/assets/img/touch-icon-ipad-76x.png"            # iOS7 Size 76x76
-apple_touch_icon_ipad_retina:    "/assets/img/touch-icon-ipad-retina-152x.png"    # iOS7 Size 152x152
-apple_touch_icon_precomposed:    "/assets/img/touch-icon-android-152x.png"        # iOS7 Size 152x152
-msapplication_tileimage:         "/assets/img/windows-8-tile-icon-144x.png"       # Windows 8 Tile 144x144
-msapplication_tilecolor:         "#334D5C"                                    # Windows 8 Tile Backgroundcolor
+favicon-32x32:                          "favicon-32x32.png"
+touch-icon-192x192:                     "touch-icon-192x192.png"
+apple-touch-icon-180x180-precomposed:   "apple-touch-icon-180x180-precomposed.png"
+apple-touch-icon-152x152-precomposed:   "apple-touch-icon-152x152-precomposed.png"
+apple-touch-icon-144x144-precomposed:   "apple-touch-icon-144x144-precomposed.png"
+apple-touch-icon-120x120-precomposed:   "apple-touch-icon-120x120-precomposed.png"
+apple-touch-icon-114x114-precomposed:   "apple-touch-icon-114x114-precomposed.png"
+apple-touch-icon-76x76-precomposed:     "apple-touch-icon-76x76-precomposed.png"
+apple-touch-icon-72x72-precomposed:     "apple-touch-icon-72x72-precomposed.png"
+apple-touch-icon-precomposed:           "apple-touch-icon-precomposed.png"
+msapplication_tileimage:                "msapplication_tileimage.png"               # Size 144x144
+msapplication_tilecolor:                "#fabb00"
 
 
 #       ______                __                __  
diff --git a/_includes/favicon b/_includes/favicon
new file mode 100644
index 0000000..0e5a2a9
--- /dev/null
+++ b/_includes/favicon
@@ -0,0 +1,77 @@
+{% comment %}
+*   
+*   More Information › https://mathiasbynens.be/notes/touch-icons
+*   
+{% endcomment %}
+
+
+{% if site.favicon-32x32 %}
+	{% comment %} Regular Old-Skool Favicon: {% endcomment %}
+	<link rel="icon" sizes="32x32" href="{{ site.url }}/assets/img/{{ site.favicon-32x32 }}">
+{% endif %}
+
+
+{% if site.touch-icon-192x192 %}
+	{% comment %} For Chrome for Android: {% endcomment %}
+	<link rel="icon" sizes="192x192" href="{{ site.url }}/assets/img/{{ site.touch-icon-192x192 }}">
+{% endif %}
+
+
+{% if site.apple-touch-icon-180x180-precomposed %}
+	{% comment %} For iPhone 6 Plus with @3× display: {% endcomment %}
+	<link rel="apple-touch-icon-precomposed" sizes="180x180" href="{{ site.url }}/assets/img/{{ site.apple-touch-icon-180x180-precomposed }}">
+{% endif %}
+
+
+{% if site.apple-touch-icon-152x152-precomposed %}
+	{% comment %} For iPad with @2× display running iOS ≥ 7: {% endcomment %}
+	<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ site.url }}/assets/img/{{ site.apple-touch-icon-152x152-precomposed }}">
+{% endif %}
+
+
+{% if site.apple-touch-icon-144x144-precomposed %}
+	{% comment %} For iPad with @2× display running iOS ≤ 6: {% endcomment %}
+	<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.url }}/assets/img/{{ site.apple-touch-icon-144x144-precomposed }}">
+{% endif %}
+
+
+{% if site.apple-touch-icon-120x120-precomposed %}
+	{% comment %} For iPhone with @2× display running iOS ≥ 7: {% endcomment %}
+	<link rel="apple-touch-icon-precomposed" sizes="120x120" href="{{ site.url }}/assets/img/{{ site.apple-touch-icon-120x120-precomposed }}">
+{% endif %}
+
+
+{% if site.apple-touch-icon-114x114-precomposed %}
+	{% comment %} For iPhone with @2× display running iOS ≤ 6: {% endcomment %}
+	<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ site.url }}/assets/img/{{ site.apple-touch-icon-114x114-precomposed }}">
+{% endif %}
+
+
+{% if site.apple-touch-icon-76x76-precomposed %}
+	{% comment %} For the iPad mini and the first- and second-generation iPad (@1× display) on iOS ≥ 7: {% endcomment %}
+	<link rel="apple-touch-icon-precomposed" sizes="76x76" href="{{ site.url }}/assets/img/{{ site.apple-touch-icon-76x76-precomposed }}">
+{% endif %}
+
+
+{% if site.apple-touch-icon-72x72-precomposed %}
+	{% comment %} For the iPad mini and the first- and second-generation iPad (@1× display) on iOS ≤ 6: {% endcomment %}
+	<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ site.url }}/assets/img/{{ site.apple-touch-icon-72x72-precomposed }}">
+{% endif %}
+
+
+{% if site.apple-touch-icon-precomposed %}
+	{% comment %} For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: {% endcomment %}
+	<link rel="apple-touch-icon-precomposed" href="{{ site.url }}/assets/img/{{ site.apple-touch-icon-precomposed }}">{% comment %} 57×57px {% endcomment %}	
+{% endif %}
+
+
+{% if site.msapplication_tileimage %}
+	{% comment %} Favicon for Windows 8  {% endcomment %}
+	<meta name="msapplication-TileImage" content="{{ site.url }}/assets/img/{{ site.msapplication_tileimage }}"/>
+{% endif %}
+
+
+{% if site.msapplication_tilecolor %}
+	{% comment %} Background Color for Tile for Windows 8  {% endcomment %}
+	<meta name="msapplication-TileColor" content="{{ site.msapplication_tilecolor }}">
+{% endif %}
diff --git a/_includes/head.html b/_includes/head.html
index f5d4198..39fa7a6 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -32,13 +32,8 @@
 	{% if page.meta_description %}<meta name="description" content="{{ page.meta_description | strip_html | escape }}"/>{% elsif page.teaser %}<meta name="description" content="{{ page.teaser | strip_html | escape }}"/>{% elsif site.description %}<meta name="description" content="{{ site.description | strip_html | escape }}"/>{% endif %}
 	
 	{% if site.google_author %}<link rel="author" href="{{ site.google_author }}"/>{% endif %}
-	{% if site.favicon %}<link rel="shortcut icon" href="{{ site.url }}{{ site.favicon }}" type="image/png" />{% endif %}
-	{% if site.favicon %}<link rel="icon" href="{{ site.url }}{{ site.favicon }}" type="image/png" />{% endif %}
-	{% if site.apple_touch_icon_iphone %}<link rel="apple-touch-icon" href="{{ site.url }}{{ site.apple_touch_icon_iphone }}">{% endif %}
-	{% if site.apple_touch_icon_iphone_retina %}<link rel="apple-touch-icon" sizes="76x76" href="{{ site.url }}{{ site.apple_touch_icon_iphone_retina }}">{% endif %}
-	{% if site.apple_touch_icon_ipad %}<link rel="apple-touch-icon" sizes="120x120" href="{{ site.url }}{{ site.apple_touch_icon_ipad }}">{% endif %}
-	{% if site.apple_touch_icon_ipad_retina %}<link rel="apple-touch-icon" sizes="152x152" href="{{ site.url }}{{ site.apple_touch_icon_ipad_retina }}">{% endif %}
-	{% if site.apple_touch_icon_precomposed %}<link rel="apple-touch-icon-precomposed" href="{{ site.url }}{{ site.apple_touch_icon_precomposed }}">{% endif %}
+
+	{% include favicon %}
 
 	<!-- Facebook Optimization -->
 	<meta property="og:locale" content="{% if site.og_locale == nil %}en_EN{% else %}{{ site.og_locale }}{% endif %}" />
diff --git a/assets/img/apple-touch-icon-114x114-precomposed.png b/assets/img/apple-touch-icon-114x114-precomposed.png
new file mode 100644
index 0000000..1297c5f
Binary files /dev/null and b/assets/img/apple-touch-icon-114x114-precomposed.png differ
diff --git a/assets/img/apple-touch-icon-120x120-precomposed.png b/assets/img/apple-touch-icon-120x120-precomposed.png
new file mode 100644
index 0000000..f5df4de
Binary files /dev/null and b/assets/img/apple-touch-icon-120x120-precomposed.png differ
diff --git a/assets/img/apple-touch-icon-144x144-precomposed.png b/assets/img/apple-touch-icon-144x144-precomposed.png
new file mode 100644
index 0000000..09aa93a
Binary files /dev/null and b/assets/img/apple-touch-icon-144x144-precomposed.png differ
diff --git a/assets/img/apple-touch-icon-152x152-precomposed.png b/assets/img/apple-touch-icon-152x152-precomposed.png
new file mode 100644
index 0000000..1297c5f
Binary files /dev/null and b/assets/img/apple-touch-icon-152x152-precomposed.png differ
diff --git a/assets/img/apple-touch-icon-180x180-precomposed.png b/assets/img/apple-touch-icon-180x180-precomposed.png
new file mode 100644
index 0000000..3f0e0da
Binary files /dev/null and b/assets/img/apple-touch-icon-180x180-precomposed.png differ
diff --git a/assets/img/apple-touch-icon-72x72-precomposed.png b/assets/img/apple-touch-icon-72x72-precomposed.png
new file mode 100644
index 0000000..a022a67
Binary files /dev/null and b/assets/img/apple-touch-icon-72x72-precomposed.png differ
diff --git a/assets/img/apple-touch-icon-76x76-precomposed.png b/assets/img/apple-touch-icon-76x76-precomposed.png
new file mode 100644
index 0000000..ca1f653
Binary files /dev/null and b/assets/img/apple-touch-icon-76x76-precomposed.png differ
diff --git a/assets/img/apple-touch-icon-precomposed.png b/assets/img/apple-touch-icon-precomposed.png
new file mode 100644
index 0000000..8c7188b
Binary files /dev/null and b/assets/img/apple-touch-icon-precomposed.png differ
diff --git a/assets/img/favicon-32x.png b/assets/img/favicon-32x.png
deleted file mode 100644
index 61266e5..0000000
Binary files a/assets/img/favicon-32x.png and /dev/null differ
diff --git a/assets/img/favicon-32x32.png b/assets/img/favicon-32x32.png
new file mode 100644
index 0000000..beeba85
Binary files /dev/null and b/assets/img/favicon-32x32.png differ
diff --git a/assets/img/msapplication_tileimage.png b/assets/img/msapplication_tileimage.png
new file mode 100644
index 0000000..09aa93a
Binary files /dev/null and b/assets/img/msapplication_tileimage.png differ
diff --git a/assets/img/touch-icon-192x192.png b/assets/img/touch-icon-192x192.png
new file mode 100644
index 0000000..f053d58
Binary files /dev/null and b/assets/img/touch-icon-192x192.png differ
diff --git a/assets/img/touch-icon-android-152x.png b/assets/img/touch-icon-android-152x.png
deleted file mode 100644
index beac5d7..0000000
Binary files a/assets/img/touch-icon-android-152x.png and /dev/null differ
diff --git a/assets/img/touch-icon-ipad-76x.png b/assets/img/touch-icon-ipad-76x.png
deleted file mode 100644
index acc47d1..0000000
Binary files a/assets/img/touch-icon-ipad-76x.png and /dev/null differ
diff --git a/assets/img/touch-icon-ipad-retina-152x.png b/assets/img/touch-icon-ipad-retina-152x.png
deleted file mode 100644
index ea8602f..0000000
Binary files a/assets/img/touch-icon-ipad-retina-152x.png and /dev/null differ
diff --git a/assets/img/touch-icon-iphone-60x.png b/assets/img/touch-icon-iphone-60x.png
deleted file mode 100644
index a724fb6..0000000
Binary files a/assets/img/touch-icon-iphone-60x.png and /dev/null differ
diff --git a/assets/img/touch-icon-iphone-retina-120x.png b/assets/img/touch-icon-iphone-retina-120x.png
deleted file mode 100644
index 507c31c..0000000
Binary files a/assets/img/touch-icon-iphone-retina-120x.png and /dev/null differ
diff --git a/assets/img/windows-8-tile-icon-144x.png b/assets/img/windows-8-tile-icon-144x.png
deleted file mode 100644
index 062b184..0000000
Binary files a/assets/img/windows-8-tile-icon-144x.png and /dev/null differ