diff --git a/bower.json b/bower.json
index 62b134f..a9cbfea 100644
--- a/bower.json
+++ b/bower.json
@@ -14,7 +14,7 @@
     "moment": "~2.13.0",
     "requirejs": "~2.2.0",
     "tablesort": "https://github.com/tristen/tablesort.git#v4.0.1",
-    "roboto-slab-fontface": "*",
+    "roboto-slab-fontface-kit": "*",
     "es6-shim": "~0.35.1",
     "almond": "~0.3.2",
     "d3": "~3.5.17",
diff --git a/html/index.html b/html/index.html
index 75008e5..37fc2dc 100644
--- a/html/index.html
+++ b/html/index.html
@@ -3,8 +3,6 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, user-scalable=no">
-  <link rel="stylesheet" href="roboto-slab-fontface.css">
-  <link rel="stylesheet" href="css/roboto-fontface.css">
   <link rel="stylesheet" href="style.css?__inline=true">
   <script>
     var jsonData = __inline(config.json);
diff --git a/scss/main.scss b/scss/main.scss
index dedcdca..dc26a0a 100644
--- a/scss/main.scss
+++ b/scss/main.scss
@@ -1,13 +1,18 @@
 // Set variables
 @import 'modules/variables';
 @import 'custom/variables';
-// Add modules
-@import 'modules/loader';
+
+// Mixins
 @import 'mixins/shadow';
-@import 'mixins/icon-mixin';
+@import 'mixins/icon';
+@import 'mixins/font';
+
+// Add modules
 @import 'modules/reset';
+@import 'modules/font/font';
 @import 'modules/base';
-@import 'modules/icon';
+@import 'modules/font/icon';
+@import 'modules/loader';
 @import 'leaflet';
 @import 'modules/leaflet';
 @import 'modules/leaflet-layer';
diff --git a/scss/mixins/_font.scss b/scss/mixins/_font.scss
new file mode 100644
index 0000000..fa2cc05
--- /dev/null
+++ b/scss/mixins/_font.scss
@@ -0,0 +1,17 @@
+$font-path: 'fonts' !default;
+
+@mixin load-font($name, $type, $weight, $style, $alias: '') {
+  @if $alias == '' {
+    $alias: $name;
+  }
+  @font-face {
+    font-family: '#{$alias}';
+    font-style: $style;
+    font-weight: $weight;
+    src: local('#{$name} #{$type}'),
+    local('#{$name}-#{$type}'),
+    url('#{$font-path}/#{$name}-#{$type}.woff2') format('woff2'),
+    url('#{$font-path}/#{$name}-#{$type}.woff') format('woff'),
+    url('#{$font-path}/#{$name}-#{$type}.ttf') format('truetype');
+  }
+}
diff --git a/scss/mixins/_icon-mixin.scss b/scss/mixins/_icon.scss
similarity index 100%
rename from scss/mixins/_icon-mixin.scss
rename to scss/mixins/_icon.scss
diff --git a/scss/modules/_variables.scss b/scss/modules/_variables.scss
index c4b1a24..deea171 100644
--- a/scss/modules/_variables.scss
+++ b/scss/modules/_variables.scss
@@ -24,3 +24,6 @@ $buttondistance: 12pt !default;
 
 // En/disable box-shadows
 $shadows: 1 !default;
+
+// En/disable included font
+$use-included-font: 1 !default;
diff --git a/scss/modules/font/_font.scss b/scss/modules/font/_font.scss
new file mode 100644
index 0000000..a051b43
--- /dev/null
+++ b/scss/modules/font/_font.scss
@@ -0,0 +1,7 @@
+$font-path: 'fonts';
+
+@if $use-included-font == 1 {
+  @include load-font('Roboto', 'Regular', 400, normal);
+  @include load-font('RobotoSlab', 'Regular', 400, normal, 'Roboto Slab');
+  @include load-font('RobotoSlab', 'Bold', 700, normal, 'Roboto Slab');
+}
diff --git a/scss/modules/font/_icon.scss b/scss/modules/font/_icon.scss
new file mode 120000
index 0000000..df2de5b
--- /dev/null
+++ b/scss/modules/font/_icon.scss
@@ -0,0 +1 @@
+../../../assets/icons/icon.scss
\ No newline at end of file
diff --git a/scss/modules/icon.scss b/scss/modules/icon.scss
deleted file mode 120000
index 1c3e5f8..0000000
--- a/scss/modules/icon.scss
+++ /dev/null
@@ -1 +0,0 @@
-../../assets/icons/icon.scss
\ No newline at end of file
diff --git a/tasks/build.js b/tasks/build.js
index b392c86..f4d124b 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -24,16 +24,17 @@ module.exports = function (grunt) {
         dest: "build/"
       },
       robotoSlab: {
-        src: ["fonts/*",
-          "roboto-slab-fontface.css"
+        src: ["**/*-Regular.*",
+          "**/*-Bold.*"
         ],
         expand: true,
-        dest: "build/",
-        cwd: "bower_components/roboto-slab-fontface"
+        dest: "build/fonts/",
+        filter: 'isFile',
+        flatten: true,
+        cwd: "bower_components/roboto-slab-fontface-kit/fonts"
       },
       roboto: {
-        src: ["fonts/*-Regular.*",
-          "css/roboto-fontface-regular.css"
+        src: ["fonts/*-Regular.*"
         ],
         expand: true,
         dest: "build/",
