diff --git a/src/ui/components/controls/search.vue b/src/ui/components/controls/search.vue
index 15a3c3ef02..7c9bcc1948 100644
--- a/src/ui/components/controls/search.vue
+++ b/src/ui/components/controls/search.vue
@@ -25,7 +25,7 @@
             direction: rtl; // Aligns glyph to right-hand side of container, for transition
             display: block;
             font-family: symbolsfont;
-            flex: 0 1 auto;
+            flex: 0 0 auto;
             opacity: 0.7;
             overflow: hidden;
             padding: 2px; // Prevents clipping
diff --git a/src/ui/components/controls/viewControl.vue b/src/ui/components/controls/viewControl.vue
index f92f52d832..0b829240aa 100644
--- a/src/ui/components/controls/viewControl.vue
+++ b/src/ui/components/controls/viewControl.vue
@@ -1,6 +1,6 @@
 <template>
     <span class="c-view-control"
-    :class="{ 'c-view-control-expanded' : expanded }"
+    :class="{ 'c-view-control--expanded' : expanded }"
     @click="toggle"></span>
 </template>
 
@@ -23,11 +23,11 @@
             font-family: symbolsfont;
             font-size: 1rem * $s;
             position: absolute;
-            transform-origin: floor(($d / 2) * $s);
+            transform-origin: floor(($d / 2) * $s); // This is slightly better than 'center'
             transition: transform 100ms ease-in-out;
         }
 
-        &-expanded {
+        &--expanded {
             &:before {
                 transform: rotate(90deg);
             }
diff --git a/src/ui/components/layout/MCTSearch.vue b/src/ui/components/layout/MCTSearch.vue
index d2bf8c7bc9..0f3de1f25e 100644
--- a/src/ui/components/layout/MCTSearch.vue
+++ b/src/ui/components/layout/MCTSearch.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="c-search c-search-major">
+    <div class="c-search c-search--major">
         <input type="search" placeholder="Search"/>
     </div>
 </template>
@@ -13,7 +13,7 @@
             width: 100%;
         }
 
-        &-major {
+        &--major {
             display: flex;
         }
     }