diff --git a/src/App.scss b/src/App.scss
index 2729e0b015..7f89506595 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -627,7 +627,6 @@ nav {
 
 .visibility-tray {
   font-size: 1.2em;
-  padding: 3px;
   cursor: pointer;
 
   .selected {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index b8b9393669..cb70d19968 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -58,7 +58,7 @@
       >
       </textarea>
       <div class="visibility-tray">
-        <span class="text-format" v-if="formattingOptionsEnabled">
+        <div class="text-format" v-if="formattingOptionsEnabled">
           <label for="post-content-type" class="select">
             <select id="post-content-type" v-model="newStatus.contentType" class="form-control">
               <option v-for="postFormat in postFormats" :key="postFormat" :value="postFormat">
@@ -67,7 +67,7 @@
             </select>
             <i class="icon-down-open"></i>
           </label>
-        </span>
+        </div>
 
         <scope-selector
           :showAll="showAllScopes"
@@ -250,7 +250,7 @@
   .form-group {
     display: flex;
     flex-direction: column;
-    padding: 0.3em 0.5em 0.6em;
+    padding: 0.25em 0.5em 0.5em;
     line-height:24px;
   }