diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 862382455..0f610228b 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -9,7 +9,7 @@
  *= require ./ui-lightness/jquery-ui-1.11.2.css
  *= require ./bootstrap-tokenfield.css
  *= require ./sew.css
- *= require ./fira-sans.css
+ *= require ./font.css
  *= require ./svg-dimensions.css
  *= require ./zammad.scss
  *
diff --git a/app/assets/stylesheets/fira-sans.css b/app/assets/stylesheets/fira-sans.css
deleted file mode 100755
index 60fbf90df..000000000
--- a/app/assets/stylesheets/fira-sans.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Generated by Font Squirrel (http://www.fontsquirrel.com) on May 14, 2015 */
-
-
-
-@font-face {
-    font-family: 'Fira Sans';
-    src: url('fonts/firasans-bold-webfont.eot');
-    src: url('fonts/firasans-bold-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/firasans-bold-webfont.woff2') format('woff2'),
-         url('fonts/firasans-bold-webfont.woff') format('woff'),
-         url('fonts/firasans-bold-webfont.ttf') format('truetype');
-    font-weight: bold;
-    font-style: normal;
-}
-
-
-
-
-@font-face {
-    font-family: 'Fira Sans';
-    src: url('fonts/firasans-book-webfont.eot');
-    src: url('fonts/firasans-book-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/firasans-book-webfont.woff2') format('woff2'),
-         url('fonts/firasans-book-webfont.woff') format('woff'),
-         url('fonts/firasans-book-webfont.ttf') format('truetype');
-    font-weight: normal;
-    font-style: normal;
-}
-
-
-
-
-@font-face {
-    font-family: 'Fira Sans';
-    src: url('fonts/firasans-light-webfont.eot');
-    src: url('fonts/firasans-light-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/firasans-light-webfont.woff2') format('woff2'),
-         url('fonts/firasans-light-webfont.woff') format('woff'),
-         url('fonts/firasans-light-webfont.ttf') format('truetype');
-    font-weight: 300;
-    font-style: normal;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/font.css b/app/assets/stylesheets/font.css
new file mode 100755
index 000000000..a75c37382
--- /dev/null
+++ b/app/assets/stylesheets/font.css
@@ -0,0 +1,35 @@
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('fonts/FiraSans-Bold.eot');
+    src: url('fonts/FiraSans-Bold.woff2') format('woff2'),
+         url('fonts/FiraSans-Bold.woff') format('woff'),
+         url('fonts/FiraSans-Bold.ttf') format('truetype');
+    font-weight: bold;
+    font-style: normal;
+}
+
+
+
+
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('fonts/FiraSans-Book.eot');
+    src: url('fonts/FiraSans-Book.woff2') format('woff2'),
+         url('fonts/FiraSans-Book.woff') format('woff'),
+         url('fonts/FiraSans-Book.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+
+
+
+
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('fonts/FiraSans-Light.eot');
+    src: url('fonts/FiraSans-Light.woff2') format('woff2'),
+         url('fonts/FiraSans-Light.woff') format('woff'),
+         url('fonts/FiraSans-Light.ttf') format('truetype');
+    font-weight: 300;
+    font-style: normal;
+}
\ No newline at end of file
diff --git a/public/assets/fonts/FiraSans-Bold.eot b/public/assets/fonts/FiraSans-Bold.eot
new file mode 100644
index 000000000..0a56c9854
Binary files /dev/null and b/public/assets/fonts/FiraSans-Bold.eot differ
diff --git a/public/assets/fonts/FiraSans-Bold.ttf b/public/assets/fonts/FiraSans-Bold.ttf
new file mode 100644
index 000000000..43c6d94ed
Binary files /dev/null and b/public/assets/fonts/FiraSans-Bold.ttf differ
diff --git a/public/assets/fonts/FiraSans-Bold.woff b/public/assets/fonts/FiraSans-Bold.woff
new file mode 100644
index 000000000..9f64cb4db
Binary files /dev/null and b/public/assets/fonts/FiraSans-Bold.woff differ
diff --git a/public/assets/fonts/FiraSans-Bold.woff2 b/public/assets/fonts/FiraSans-Bold.woff2
new file mode 100644
index 000000000..2d505633d
Binary files /dev/null and b/public/assets/fonts/FiraSans-Bold.woff2 differ
diff --git a/public/assets/fonts/FiraSans-Book.eot b/public/assets/fonts/FiraSans-Book.eot
new file mode 100644
index 000000000..bd3794d16
Binary files /dev/null and b/public/assets/fonts/FiraSans-Book.eot differ
diff --git a/public/assets/fonts/FiraSans-Book.ttf b/public/assets/fonts/FiraSans-Book.ttf
new file mode 100644
index 000000000..171726b50
Binary files /dev/null and b/public/assets/fonts/FiraSans-Book.ttf differ
diff --git a/public/assets/fonts/FiraSans-Book.woff b/public/assets/fonts/FiraSans-Book.woff
new file mode 100644
index 000000000..6d2c677b1
Binary files /dev/null and b/public/assets/fonts/FiraSans-Book.woff differ
diff --git a/public/assets/fonts/FiraSans-Book.woff2 b/public/assets/fonts/FiraSans-Book.woff2
new file mode 100644
index 000000000..e766de445
Binary files /dev/null and b/public/assets/fonts/FiraSans-Book.woff2 differ
diff --git a/public/assets/fonts/FiraSans-Light.eot b/public/assets/fonts/FiraSans-Light.eot
new file mode 100644
index 000000000..87efee0cb
Binary files /dev/null and b/public/assets/fonts/FiraSans-Light.eot differ
diff --git a/public/assets/fonts/FiraSans-Light.ttf b/public/assets/fonts/FiraSans-Light.ttf
new file mode 100644
index 000000000..03fff66fb
Binary files /dev/null and b/public/assets/fonts/FiraSans-Light.ttf differ
diff --git a/public/assets/fonts/FiraSans-Light.woff b/public/assets/fonts/FiraSans-Light.woff
new file mode 100644
index 000000000..d432e54c6
Binary files /dev/null and b/public/assets/fonts/FiraSans-Light.woff differ
diff --git a/public/assets/fonts/FiraSans-Light.woff2 b/public/assets/fonts/FiraSans-Light.woff2
new file mode 100644
index 000000000..c5fffdb89
Binary files /dev/null and b/public/assets/fonts/FiraSans-Light.woff2 differ
diff --git a/public/assets/fonts/firasans-bold-webfont.eot b/public/assets/fonts/firasans-bold-webfont.eot
deleted file mode 100755
index f4b8287cd..000000000
Binary files a/public/assets/fonts/firasans-bold-webfont.eot and /dev/null differ
diff --git a/public/assets/fonts/firasans-bold-webfont.ttf b/public/assets/fonts/firasans-bold-webfont.ttf
deleted file mode 100755
index a018e8b5e..000000000
Binary files a/public/assets/fonts/firasans-bold-webfont.ttf and /dev/null differ
diff --git a/public/assets/fonts/firasans-bold-webfont.woff b/public/assets/fonts/firasans-bold-webfont.woff
deleted file mode 100755
index 6c72aef2c..000000000
Binary files a/public/assets/fonts/firasans-bold-webfont.woff and /dev/null differ
diff --git a/public/assets/fonts/firasans-bold-webfont.woff2 b/public/assets/fonts/firasans-bold-webfont.woff2
deleted file mode 100755
index f22279f15..000000000
Binary files a/public/assets/fonts/firasans-bold-webfont.woff2 and /dev/null differ
diff --git a/public/assets/fonts/firasans-book-webfont.eot b/public/assets/fonts/firasans-book-webfont.eot
deleted file mode 100755
index 0337ee54c..000000000
Binary files a/public/assets/fonts/firasans-book-webfont.eot and /dev/null differ
diff --git a/public/assets/fonts/firasans-book-webfont.ttf b/public/assets/fonts/firasans-book-webfont.ttf
deleted file mode 100755
index 5383f0d62..000000000
Binary files a/public/assets/fonts/firasans-book-webfont.ttf and /dev/null differ
diff --git a/public/assets/fonts/firasans-book-webfont.woff b/public/assets/fonts/firasans-book-webfont.woff
deleted file mode 100755
index 2f29c3864..000000000
Binary files a/public/assets/fonts/firasans-book-webfont.woff and /dev/null differ
diff --git a/public/assets/fonts/firasans-book-webfont.woff2 b/public/assets/fonts/firasans-book-webfont.woff2
deleted file mode 100755
index 6b9fadf9c..000000000
Binary files a/public/assets/fonts/firasans-book-webfont.woff2 and /dev/null differ
diff --git a/public/assets/fonts/firasans-light-webfont.eot b/public/assets/fonts/firasans-light-webfont.eot
deleted file mode 100755
index f97fe8bc6..000000000
Binary files a/public/assets/fonts/firasans-light-webfont.eot and /dev/null differ
diff --git a/public/assets/fonts/firasans-light-webfont.ttf b/public/assets/fonts/firasans-light-webfont.ttf
deleted file mode 100755
index 99ed48da2..000000000
Binary files a/public/assets/fonts/firasans-light-webfont.ttf and /dev/null differ
diff --git a/public/assets/fonts/firasans-light-webfont.woff b/public/assets/fonts/firasans-light-webfont.woff
deleted file mode 100755
index b5c69cf29..000000000
Binary files a/public/assets/fonts/firasans-light-webfont.woff and /dev/null differ
diff --git a/public/assets/fonts/firasans-light-webfont.woff2 b/public/assets/fonts/firasans-light-webfont.woff2
deleted file mode 100755
index f668bb49c..000000000
Binary files a/public/assets/fonts/firasans-light-webfont.woff2 and /dev/null differ