diff --git a/app/assets/stylesheets/admin/all.scss b/app/assets/stylesheets/admin/all.scss
index c6b7412c79..637f0b5d2c 100644
--- a/app/assets/stylesheets/admin/all.scss
+++ b/app/assets/stylesheets/admin/all.scss
@@ -15,4 +15,6 @@
 */
 
 @import 'variables';
-@import '**/*';
+@import 'components/*';
+@import '*';
+@import 'pages/*';
diff --git a/app/assets/stylesheets/admin/pages/product_image_upload_modal.css.scss b/app/assets/stylesheets/admin/pages/product_image_upload_modal.css.scss
new file mode 100644
index 0000000000..ab57630438
--- /dev/null
+++ b/app/assets/stylesheets/admin/pages/product_image_upload_modal.css.scss
@@ -0,0 +1,18 @@
+.reveal-modal.product-image-upload {
+  width: 300px;
+  a.close-reveal-modal {
+    font-size: 23px;
+    color: #de6060;
+    right: 0.45rem;
+    top: 0.35rem;
+    :hover {
+      color: #bf4545;
+    }
+  }
+  div.image-preview {
+    //float: left;
+  }
+  label {
+    margin-top: 20px;
+  }
+}
diff --git a/app/assets/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss
index 933f43a00b..30cf3b5558 100644
--- a/app/assets/stylesheets/admin/products.css.scss
+++ b/app/assets/stylesheets/admin/products.css.scss
@@ -98,25 +98,6 @@ table#listing_products.bulk {
   }
 }
 
-.reveal-modal.product-image-upload {
-  width: 300px;
-  a.close-reveal-modal {
-    font-size: 23px;
-    color: #de6060;
-    right: 0.45rem;
-    top: 0.35rem;
-    :hover {
-      color: #bf4545;
-    }
-  }
-  div.image-preview {
-    //float: left;
-  }
-  label {
-    margin-top: 20px;
-  }
-}
-
 form#image_upload {
   text-align: center;
   .spinner {
diff --git a/app/assets/stylesheets/darkswarm/all.scss b/app/assets/stylesheets/darkswarm/all.scss
index 6cfc32e605..7c27103b17 100644
--- a/app/assets/stylesheets/darkswarm/all.scss
+++ b/app/assets/stylesheets/darkswarm/all.scss
@@ -10,7 +10,8 @@
 @import 'foundation-icons';
 
 @import '*';
+@import 'pages/*';
 
 ofn-modal {
   display: block;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/darkswarm/cookies_banner.css.scss b/app/assets/stylesheets/darkswarm/pages/cookies_banner.css.scss
similarity index 95%
rename from app/assets/stylesheets/darkswarm/cookies_banner.css.scss
rename to app/assets/stylesheets/darkswarm/pages/cookies_banner.css.scss
index 723b41eb1f..6223220977 100644
--- a/app/assets/stylesheets/darkswarm/cookies_banner.css.scss
+++ b/app/assets/stylesheets/darkswarm/pages/cookies_banner.css.scss
@@ -1,4 +1,4 @@
-@import 'branding';
+@import '../branding';
 
 .cookies-banner {
   background: $dark-grey;
diff --git a/app/assets/stylesheets/darkswarm/cookies_policy_modal.css.scss b/app/assets/stylesheets/darkswarm/pages/cookies_policy_modal.css.scss
similarity index 94%
rename from app/assets/stylesheets/darkswarm/cookies_policy_modal.css.scss
rename to app/assets/stylesheets/darkswarm/pages/cookies_policy_modal.css.scss
index 029cf1f211..942a4396e0 100644
--- a/app/assets/stylesheets/darkswarm/cookies_policy_modal.css.scss
+++ b/app/assets/stylesheets/darkswarm/pages/cookies_policy_modal.css.scss
@@ -1,4 +1,4 @@
-@import 'branding';
+@import '../branding';
 
 .cookies-policy-modal {
   background: $disabled-light;
diff --git a/app/assets/stylesheets/darkswarm/modal-login.css.scss b/app/assets/stylesheets/darkswarm/pages/login_modal.css.scss
similarity index 100%
rename from app/assets/stylesheets/darkswarm/modal-login.css.scss
rename to app/assets/stylesheets/darkswarm/pages/login_modal.css.scss