diff --git a/app/assets/javascripts/admin/orders/directives/invoices_modal.js.coffee b/app/assets/javascripts/admin/orders/directives/invoices_modal.js.coffee
index b774f05b57..0f2eabe778 100644
--- a/app/assets/javascripts/admin/orders/directives/invoices_modal.js.coffee
+++ b/app/assets/javascripts/admin/orders/directives/invoices_modal.js.coffee
@@ -2,4 +2,4 @@ angular.module("admin.orders").directive "invoicesModal", ($modal) ->
   restrict: 'C'
   link: (scope, elem, attrs, ctrl) ->
     elem.on "click", (ev) =>
-      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/bulk_invoice.html', controller: ctrl, scope: scope, windowClass: 'bulk-invoice-modal')
+      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/bulk_invoice.html', controller: ctrl, scope: scope, windowClass: 'simple-modal')
diff --git a/app/assets/javascripts/admin/products/directives/image_modal.js.coffee b/app/assets/javascripts/admin/products/directives/image_modal.js.coffee
index 526c14bf2a..69ca1731fd 100644
--- a/app/assets/javascripts/admin/products/directives/image_modal.js.coffee
+++ b/app/assets/javascripts/admin/products/directives/image_modal.js.coffee
@@ -2,5 +2,5 @@ angular.module("ofn.admin").directive "imageModal", ($modal, ProductImageService
   restrict: 'C'
   link: (scope, elem, attrs, ctrl) ->
     elem.on "click", (ev) =>
-      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/image_upload.html', controller: ctrl, scope: scope, windowClass: 'product-image-upload')
+      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/image_upload.html', controller: ctrl, scope: scope, windowClass: 'simple-modal')
       ProductImageService.configure(scope.product)
diff --git a/app/assets/stylesheets/admin/all.scss b/app/assets/stylesheets/admin/all.scss
index 637f0b5d2c..4a16154bf4 100644
--- a/app/assets/stylesheets/admin/all.scss
+++ b/app/assets/stylesheets/admin/all.scss
@@ -17,4 +17,3 @@
 @import 'variables';
 @import 'components/*';
 @import '*';
-@import 'pages/*';
diff --git a/app/assets/stylesheets/admin/pages/product_image_upload_modal.css.scss b/app/assets/stylesheets/admin/components/simple_modal.css.scss
similarity index 87%
rename from app/assets/stylesheets/admin/pages/product_image_upload_modal.css.scss
rename to app/assets/stylesheets/admin/components/simple_modal.css.scss
index 4dffade73e..453fe6da4f 100644
--- a/app/assets/stylesheets/admin/pages/product_image_upload_modal.css.scss
+++ b/app/assets/stylesheets/admin/components/simple_modal.css.scss
@@ -1,6 +1,6 @@
 @import '../variables';
 
-.reveal-modal.product-image-upload {
+.reveal-modal.simple-modal {
   width: 300px;
 
   .close-reveal-modal {
diff --git a/app/assets/stylesheets/admin/orders.css.scss b/app/assets/stylesheets/admin/orders.css.scss
index 2c0c37e657..6355a4499c 100644
--- a/app/assets/stylesheets/admin/orders.css.scss
+++ b/app/assets/stylesheets/admin/orders.css.scss
@@ -115,22 +115,18 @@ table.index td.actions {
   }
 }
 
-.bulk-invoice-modal {
+.simple-modal {
   text-align: center;
 
   .modal-title {
     margin-bottom: 1.5em;
   }
 
-  .message {
+  .message, .error {
     margin-bottom: 1em;
   }
 
   .error {
-    margin-bottom: 1em;
-  }
-
-  .spinner {
-
+    color: $warning-red;
   }
 }
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 5ea80b6e5e..10edf3ecb8 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -759,9 +759,9 @@ feature %q{
       end
 
       # Shows upload modal
-      expect(page).to have_selector "div.reveal-modal.product-image-upload"
+      expect(page).to have_selector "div.reveal-modal"
 
-      within "div.reveal-modal.product-image-upload" do
+      within "div.reveal-modal" do
         # Shows preview of current image
         expect(page).to have_css "img.preview"
 
@@ -773,7 +773,7 @@ feature %q{
         expect(page).to have_no_css "img.spinner", visible: true
       end
 
-      expect(page).to have_no_selector "div.reveal-modal.product-image-upload"
+      expect(page).to have_no_selector "div.reveal-modal"
 
       within "table#listing_products tr#p_#{product.id}" do
         # New thumbnail is shown in image column
@@ -783,7 +783,7 @@ feature %q{
         page.find("a.image-modal").trigger('click')
       end
 
-      expect(page).to have_selector "div.reveal-modal.product-image-upload"
+      expect(page).to have_selector "div.reveal-modal"
     end
   end
 end