diff --git a/Gruntfile.js b/Gruntfile.js
index fade7c6817645f4df8ca370b9212127a82a1bef1..21bcf23e926cf5fb6420536ff1adf6c87b02711a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -100,8 +100,13 @@ module.exports = function(grunt) {
               order: 4
             },
             {
-              pattern: '$fa-font-path: "../../../fonts" !default;',
-              replacement: '$fa-font-path: "fonts";',
+              pattern: '$fa-font-path: "../../../fonts" !default;\n',
+              replacement: '',
+              order: 4
+            },
+            {
+              pattern: '@import "vendor/font-awesome/font-awesome";',
+              replacement: '$fa-font-path: "fonts";\n@import "vendor/font-awesome/font-awesome";',
               order: 4
             },
             {
diff --git a/themes/bootstrap3/less/bootstrap.less b/themes/bootstrap3/less/bootstrap.less
index 71c5b69ebc61705bf3581894fb2ad480c03f5191..6c4af3e9b8b6e4eddba62d4a0fe8480d3bcc1060 100644
--- a/themes/bootstrap3/less/bootstrap.less
+++ b/themes/bootstrap3/less/bootstrap.less
@@ -1,11 +1,11 @@
-@fa-font-path: "../../../fonts";
-@img-path: "../../images";
-
 @import "vendor/bootstrap/bootstrap";
 @import "vendor/font-awesome/font-awesome";
 @import "vendor/bootstrap-accessibility/bootstrap-accessibility";
 @import "vendor/a11y";
 
+@fa-font-path: "../../../fonts";
+@img-path: "../../images";
+
 @import "components/advanced-search";
 @import "components/alphabrowse";
 @import "components/autocomplete";
diff --git a/themes/bootstrap3/scss/bootstrap.scss b/themes/bootstrap3/scss/bootstrap.scss
index 651e5dd1e5a352cc22f4bf97faad53ea73c099aa..eeae21f130cec50ae4b7f8dec7fdee49becd0bef 100644
--- a/themes/bootstrap3/scss/bootstrap.scss
+++ b/themes/bootstrap3/scss/bootstrap.scss
@@ -1,11 +1,11 @@
-$fa-font-path: "fonts";
-$img-path: "../images";
-
 @import "vendor/bootstrap";
+$fa-font-path: "fonts";
 @import "vendor/font-awesome/font-awesome";
 @import "vendor/bootstrap-accessibility/bootstrap-accessibility";
 @import "vendor/a11y";
 
+$img-path: "../images";
+
 @import "components/advanced-search";
 @import "components/alphabrowse";
 @import "components/autocomplete";