diff --git a/app/assets/stylesheets/darkswarm/shop.css.scss b/app/assets/stylesheets/darkswarm/shop.css.scss
index 3a1b68153f..300469fdf7 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.scss
+++ b/app/assets/stylesheets/darkswarm/shop.css.scss
@@ -114,7 +114,7 @@
     margin-bottom: 0px;
   }
 
-  .shopfront-message {
+  .open-shop-message {
     a {
       color: #0096ad;
 
@@ -125,43 +125,43 @@
     }
   }
 
-  .closed_shop_header {
+  .closed-shop-header {
     background-color: $grey-650;
     color: $white;
 
     h4 {
       color: $white;
-
-      div {
-        display: inline-block;
-      }
     }
 
     p {
       line-height: 2.5rem;
       margin-bottom: 0;
     }
+
+    .message {
+      display: inline-block;
+    }
   }
 
-  .warning_sign {
+  .warning-sign {
     margin: 0 10px 0 5px;
 
-    .rectangle {
-      position: absolute;
-      top: 27px;
-      color: $grey-650;
-      width: 23px;
-      height: 23px;
-      transform: rotate(-315deg);
-      border-radius: 4px;
-      background-color: #ffffff;
-    }
-
     strong {
-      text-align: center;
       color: $grey-650;
       display: block;
       position: relative;
+      text-align: center;
+      width: 23px;
+    }
+
+    .rectangle {
+      background-color: $black;
+      border-radius: 4px;
+      color: $grey-650;
+      height: 23px;
+      position: absolute;
+      top: 27px;
+      transform: rotate(-315deg);
       width: 23px;
     }
   }
diff --git a/app/assets/stylesheets/darkswarm/shop_tabs.css.scss b/app/assets/stylesheets/darkswarm/shop_tabs.css.scss
index 5d36d05846..b2fe97fb12 100644
--- a/app/assets/stylesheets/darkswarm/shop_tabs.css.scss
+++ b/app/assets/stylesheets/darkswarm/shop_tabs.css.scss
@@ -117,9 +117,9 @@
         margin-bottom: 2px;
       }
     }
-  }
 
-  .page-view.with-darker-background {
-    background-color: $grey-080;
+    .with-darker-background {
+        background-color: $grey-080;
+    }
   }
 }
diff --git a/app/views/shop/messages/_closed_shop.html.haml b/app/views/shop/messages/_closed_shop.html.haml
index da7d2f30a4..128abf2775 100644
--- a/app/views/shop/messages/_closed_shop.html.haml
+++ b/app/views/shop/messages/_closed_shop.html.haml
@@ -1,11 +1,11 @@
-.row.closed_shop_header
+.row.closed-shop-header
   .small-12.columns
     .content{ "darker-background" => true }
       %h4
-        .warning_sign
+        .warning-sign
           .rectangle
           %strong !
-        %div
+        .message
           = t :shopping_oc_closed
       %p
         = render partial: "shopping_shared/next_order_cycle"
diff --git a/app/views/shop/messages/_open_shop.html.haml b/app/views/shop/messages/_open_shop.html.haml
index 99142bb873..49180ebc88 100644
--- a/app/views/shop/messages/_open_shop.html.haml
+++ b/app/views/shop/messages/_open_shop.html.haml
@@ -1,5 +1,5 @@
 .content
   .row
     .small-12.columns
-      .shopfront-message
+      .open-shop-message
         = current_distributor.preferred_shopfront_message.html_safe