diff --git a/.gitignore b/.gitignore
index e44031e5057361cb1195da5cda6c37dd14ff18d8..e67bc2eecc5e8f3d1683a278fefca11f4f137389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ logs/*
 node_modules
 public/assets/*
 pubsweet.log
+.DS_Store
diff --git a/app/components/SimpleEditor/SimpleEditor.scss b/app/components/SimpleEditor/SimpleEditor.scss
index 7dfb242d3d426f8e856d9e2a88ad068cb4ef5b37..4a658e732220ea6bb9d4f5235b16570c8d1d0e48 100644
--- a/app/components/SimpleEditor/SimpleEditor.scss
+++ b/app/components/SimpleEditor/SimpleEditor.scss
@@ -58,17 +58,51 @@ $white: #fff;
     border: 1px solid $border;
     border-right: 0;
     padding-left: 0;
-
-    button {
-      color: $transparent-black;
+    vertical-align: middle;
+    @-moz-document url-prefix() {
+      .sc-tool-group > .sc-switch-text-type {
+        margin: 0;
+        position: relative;
+        top: 8px;
+      }
     }
 
     .sm-target-text {
-      border-right: 1px solid $border;
       padding: 0;
-    }
+      height: 100%;
+      position: relative;
+      bottom: 5px;
+      .sc-switch-text-type {
+        margin-left: 1px;
+        width: 150px;
+        button {
+          color: $transparent-black;
+          height: inherit;
+          position: relative;
+          top: 5px;
+        }
+        .se-toggle {
+          background: transparent;
+          border: 0;
+          font-family: 'Fira Sans';
+          font-size: 14px;
+          outline: none;
+        }
+
+        .se-options {
+          top: 36px;
+        }
+
+        .se-option {
+          background-color: $white;
+          border: 0;
+          font-family: 'Fira Sans';
+        }
+      }
+    } // end dropdown
 
     .sm-target-document {
+      border-left: 1px solid $border;
       border-right: 1px solid $border;
       padding-right: 9px;
     }
@@ -119,7 +153,7 @@ $white: #fff;
       }
     }
 
-    .sc-tool-group {
+    .sm-target-document, .sm-target-annotations, .sm-target-insert {
       .sc-button {
         background: transparent;
         border: 0;
@@ -135,49 +169,27 @@ $white: #fff;
             background: transparent;
           }
         }
-      }
+     }
 
-      .sm-active {
-        background: $toolbar-active-bg;
-        color: $black;
-        margin: 0;
-        outline: none;
-        padding: 0;
+    .sm-active {
+      background: $toolbar-active-bg;
+      color: $black;
+      margin: 0;
+      outline: none;
+      padding: 0;
 
-        &:after {
-          bottom: 17px;
-          color: $black;
-          content: 'x';
-          font-size: 8px;
-          left: 21px;
-          position: absolute;
-        }
+      &:after {
+        bottom: 17px;
+        color: $black;
+        content: 'x';
+        font-size: 8px;
+        left: 21px;
+        position: absolute;
       }
     }
   }
 
-  .sc-switch-text-type {
-    margin-left: 1px;
-    width: 150px;
-
-    .se-toggle {
-      background: transparent;
-      border: 0;
-      font-family: 'Fira Sans';
-      font-size: 14px;
-      outline: none;
-    }
-
-    .se-options {
-      top: 36px;
-    }
-
-    .se-option {
-      background-color: $white;
-      border: 0;
-      font-family: 'Fira Sans';
-    }
-  }
+  } // End sc-toolbar
 
   .se-scrollable {
     background-color: $primary;
@@ -232,7 +244,7 @@ $white: #fff;
       border-style: none;
       border-width: 0;
   }
-}
+} // end sc-content
 
   .sc-has-comments {
     .se-content {