diff --git a/edit.html b/edit.html
index b5a973e0..8d057bfb 100644
--- a/edit.html
+++ b/edit.html
@@ -269,13 +269,13 @@
           <button id="beautify" i18n-text="styleBeautify"></button>
           <a href="manage.html" tabindex="-1"><button id="cancel-button" i18n-text="styleCancelEditLabel"></button></a>
         </div>
-        <p id="mozilla-format-container">
+        <div id="mozilla-format-container">
           <button id="from-mozilla" i18n-text="importLabel"></button>
           <button id="to-mozilla" i18n-text="exportLabel"></button>
           <a id="to-mozilla-help" class="svg-inline-wrapper" href="#">
             <svg class="svg-icon info"><use xlink:href="#svg-icon-help"/></svg>
           </a>
-        </p>
+        </div>
       </section>
       <details id="options" data-pref="editor.options.expanded">
         <summary><h2 id="options-heading" i18n-text="optionsHeading"></h2></summary>
diff --git a/edit/edit.css b/edit/edit.css
index a04d1700..4acdc13b 100644
--- a/edit/edit.css
+++ b/edit/edit.css
@@ -81,6 +81,11 @@ label {
   min-height: 1.4rem;
 }
 
+#mozilla-format-container {
+  align-items: center;
+  margin-top: .5rem;
+}
+
 /* basic info */
 #basic-info {
   margin-bottom: 1rem;
@@ -143,7 +148,7 @@ label {
   height: 16px;
 }
 .svg-inline-wrapper {
-  margin-left: .2rem;
+  margin-left: .1rem;
   display: inline-block;
   vertical-align: middle;
 }
@@ -191,7 +196,7 @@ input:invalid {
   align-items: center;
   margin-left: -13px;
   cursor: pointer;
-  margin-top: 8px;
+  margin-top: .8rem;
   margin-bottom: 8px;
 }
 
@@ -210,10 +215,6 @@ input:invalid {
   margin-top: -3px;
 }
 
-#actions {
-  margin-bottom: .5rem;
-}
-
 #options:not([open]) + #lint h2 {
   margin-top: 0;
 }