diff --git a/res/themes/dark/css/dark.scss b/res/themes/dark/css/dark.scss
index b69f096db7..5cc6a0d659 100644
--- a/res/themes/dark/css/dark.scss
+++ b/res/themes/dark/css/dark.scss
@@ -1,4 +1,4 @@
+@import "../../light/css/_fonts.scss";
 @import "../../light/css/_base.scss";
 @import "_dark.scss";
 @import "../../../../res/css/_components.scss";
-
diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/dharma/css/_dharma.scss
index c70d7f020a..2d76bd7da3 100644
--- a/res/themes/dharma/css/_dharma.scss
+++ b/res/themes/dharma/css/_dharma.scss
@@ -1,5 +1,3 @@
-@import "_fonts.scss";
-
 // XXX: check this?
 /* Nunito lacks combining diacritics, so these will fall through
    to the next font.  Helevetica's diacritics however do not combine
diff --git a/res/themes/dharma/css/dharma.scss b/res/themes/dharma/css/dharma.scss
index 0f4db55fd2..7e3e69de34 100644
--- a/res/themes/dharma/css/dharma.scss
+++ b/res/themes/dharma/css/dharma.scss
@@ -1,3 +1,3 @@
+@import "_fonts.scss";
 @import "_dharma.scss";
 @import "../../../../res/css/_components.scss";
-
diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss
index 96c179f6f5..44f9042554 100644
--- a/res/themes/light/css/_base.scss
+++ b/res/themes/light/css/_base.scss
@@ -1,5 +1,3 @@
-@import "_fonts.scss";
-
 /* Open Sans lacks combining diacritics, so these will fall through
    to the next font.  Helevetica's diacritics however do not combine
    nicely with Open Sans (on OSX, at least) and result in a huge
diff --git a/res/themes/light/css/light.scss b/res/themes/light/css/light.scss
index 2099f41f60..62464316f4 100644
--- a/res/themes/light/css/light.scss
+++ b/res/themes/light/css/light.scss
@@ -1,3 +1,3 @@
+@import "_fonts.scss";
 @import "_base.scss";
 @import "../../../../res/css/_components.scss";
-