diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index 8ee73d537e3..32643962ddc 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -16,6 +16,7 @@
 @import "base/forms";
 @import "base/grid";
 @import "base/font_awesome";
+@import "base/grafana_icons";
 
 // UTILS
 @import "utils/utils";
diff --git a/public/sass/base/_fonts.scss b/public/sass/base/_fonts.scss
index fb339bc60cf..0457c86b9e7 100644
--- a/public/sass/base/_fonts.scss
+++ b/public/sass/base/_fonts.scss
@@ -1,3 +1,27 @@
+/* icon fonts
+
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('../fonts/fontawesome-webfont.eot?v=4.2.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+    font-family: 'grafana-icons';
+    src:    url('../fonts/grafana-icons.eot?h6rv8b');
+    src:    url('../fonts/grafana-icons.eot?h6rv8b#iefix') format('embedded-opentype'),
+        url('../fonts/grafana-icons.ttf?h6rv8b') format('truetype'),
+        url('../fonts/grafana-icons.woff?h6rv8b') format('woff'),
+        url('../fonts/grafana-icons.svg?h6rv8b#grafana-icons') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}*/
+
+
+/* Open sans fonts*/
+
 /* cyrillic-ext */
 @font-face {
   font-family: 'Open Sans';
diff --git a/public/sass/fonts.scss b/public/sass/fonts.scss
index c45e63111c3..8d50752f4e7 100644
--- a/public/sass/fonts.scss
+++ b/public/sass/fonts.scss
@@ -1,3 +1 @@
 @import "base/fonts";
-@import "base/font_awesome";
-@import "base/grafana_icons";