diff --git a/_includes/header.html b/_includes/header.html
index 18d7660b8..6da8cef43 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -29,7 +29,7 @@
 
 <!-- Favicons -->
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}docs-assets/ico/apple-touch-icon-144-precomposed.png">
-                               <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.png">
+                               <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.ico">
 
 <script>
   var _gaq = _gaq || [];
diff --git a/docs-assets/ico/favicon.ico b/docs-assets/ico/favicon.ico
new file mode 100644
index 000000000..f576a4696
Binary files /dev/null and b/docs-assets/ico/favicon.ico differ
diff --git a/docs-assets/ico/favicon.png b/docs-assets/ico/favicon.png
deleted file mode 100644
index 4e4560fd8..000000000
Binary files a/docs-assets/ico/favicon.png and /dev/null differ
diff --git a/examples/blog/index.html b/examples/blog/index.html
index 06e8243a0..8fe66e37b 100644
--- a/examples/blog/index.html
+++ b/examples/blog/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Blog Template for Bootstrap</title>
 
diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index 2e8516fab..27ef81ecb 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Carousel Template for Bootstrap</title>
 
diff --git a/examples/cover/index.html b/examples/cover/index.html
index ae9ca1829..2ed969f5b 100644
--- a/examples/cover/index.html
+++ b/examples/cover/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Cover Template for Bootstrap</title>
 
diff --git a/examples/dashboard/index.html b/examples/dashboard/index.html
index e721aa16a..785e0d50c 100644
--- a/examples/dashboard/index.html
+++ b/examples/dashboard/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Dashboard Template for Bootstrap</title>
 
diff --git a/examples/grid/index.html b/examples/grid/index.html
index be1e39c1f..e8c2d7097 100644
--- a/examples/grid/index.html
+++ b/examples/grid/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Grid Template for Bootstrap</title>
 
diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html
index 3f6e68908..a0c47cd99 100644
--- a/examples/jumbotron-narrow/index.html
+++ b/examples/jumbotron-narrow/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Narrow Jumbotron Template for Bootstrap</title>
 
diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html
index b7ff7f76c..694a3e081 100644
--- a/examples/jumbotron/index.html
+++ b/examples/jumbotron/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Jumbotron Template for Bootstrap</title>
 
diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html
index 9c36f6647..07291feef 100644
--- a/examples/justified-nav/index.html
+++ b/examples/justified-nav/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Justified Nav Template for Bootstrap</title>
 
diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html
index de04aa645..6a8e9bf62 100644
--- a/examples/navbar-fixed-top/index.html
+++ b/examples/navbar-fixed-top/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Fixed Top Navbar Example for Bootstrap</title>
 
diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html
index c77c00a20..e7af72367 100644
--- a/examples/navbar-static-top/index.html
+++ b/examples/navbar-static-top/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Static Top Navbar Example for Bootstrap</title>
 
diff --git a/examples/navbar/index.html b/examples/navbar/index.html
index 24c154a49..0de03c36c 100644
--- a/examples/navbar/index.html
+++ b/examples/navbar/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Navbar Template for Bootstrap</title>
 
diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html
index 73baa43e5..f09977a77 100644
--- a/examples/non-responsive/index.html
+++ b/examples/non-responsive/index.html
@@ -8,7 +8,7 @@
 
     <!-- Note there is no responsive meta tag here -->
 
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Non-responsive Template for Bootstrap</title>
 
diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html
index a9350bdd6..88ca7bfbe 100644
--- a/examples/offcanvas/index.html
+++ b/examples/offcanvas/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Off Canvas Template for Bootstrap</title>
 
diff --git a/examples/signin/index.html b/examples/signin/index.html
index 2f6e37020..00f8ad604 100644
--- a/examples/signin/index.html
+++ b/examples/signin/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Signin Template for Bootstrap</title>
 
diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html
index a792db821..68d95d683 100644
--- a/examples/starter-template/index.html
+++ b/examples/starter-template/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Starter Template for Bootstrap</title>
 
diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html
index 35641e35a..0fd36f029 100644
--- a/examples/sticky-footer-navbar/index.html
+++ b/examples/sticky-footer-navbar/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Sticky Footer Navbar Template for Bootstrap</title>
 
diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html
index e5807130e..5eadd6ac1 100644
--- a/examples/sticky-footer/index.html
+++ b/examples/sticky-footer/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Sticky Footer Template for Bootstrap</title>
 
diff --git a/examples/theme/index.html b/examples/theme/index.html
index 5adb44ab0..4b26f87cf 100644
--- a/examples/theme/index.html
+++ b/examples/theme/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.ico">
 
     <title>Theme Template for Bootstrap</title>