diff --git a/ghost/admin/assets/sass/components/modals.scss b/ghost/admin/assets/sass/components/modals.scss
index ec55ebb908..fad882692b 100644
--- a/ghost/admin/assets/sass/components/modals.scss
+++ b/ghost/admin/assets/sass/components/modals.scss
@@ -37,7 +37,7 @@
     z-index: 1030;
 }
 
-.modal {
+%modal {
     left: 50%;
     right: auto;
     width: 450px;
@@ -70,7 +70,7 @@
 }
 
 .modal-action {
-    @extend .modal;
+    @extend %modal;
     padding: 60px 0 30px;
 
     @media (max-width: 800px) {
@@ -123,7 +123,7 @@
 .modal-footer {
     margin-top: 20px;
     .reject-button-class {
-        @extend .button;
+        @extend .btn;
     }
 }
 
diff --git a/ghost/admin/assets/sass/components/notifications.scss b/ghost/admin/assets/sass/components/notifications.scss
index 1cc0b7c5bc..97d9578849 100644
--- a/ghost/admin/assets/sass/components/notifications.scss
+++ b/ghost/admin/assets/sass/components/notifications.scss
@@ -31,7 +31,7 @@
 // Base Notification
 // --------------------------------------------------
 
-.notification {
+%notification {
     @include icon($i-notification) {
         position: absolute;
         top: 0;
@@ -94,7 +94,7 @@
 // --------------------------------------------------
 
 .notification-success {
-    @extend .notification;
+    @extend %notification;
     @include icon($i-success);
     background: $green;
 
@@ -111,20 +111,20 @@
 }
 
 .notification-error {
-    @extend .notification;
+    @extend %notification;
     @include icon($i-error);
     background: $red;
 }
 
 
 .notification-warn {
-    @extend .notification;
+    @extend %notification;
     @include icon($i-info);
     background: $orange;
 }
 
 .notification-info {
-    @extend .notification;
+    @extend %notification;
     @include icon($i-info);
     background: $blue;
 }
diff --git a/ghost/admin/assets/sass/patterns/buttons.scss b/ghost/admin/assets/sass/patterns/buttons.scss
index 9ab2f12b5c..9cbf17c022 100644
--- a/ghost/admin/assets/sass/patterns/buttons.scss
+++ b/ghost/admin/assets/sass/patterns/buttons.scss
@@ -6,7 +6,7 @@
 // Base styles
 // --------------------------------------------------
 
-.btn {
+%button {
     display: inline-block;
     margin-bottom: 0; // For input.btn
     padding: 9px 14px;
@@ -55,6 +55,9 @@
         box-shadow: none;
     }
 }
+.btn {
+    @extend %button;
+}
 
 
 // Alternate buttons