diff --git a/popup.html b/popup.html
index 022a15ff..812efad0 100644
--- a/popup.html
+++ b/popup.html
@@ -22,25 +22,29 @@
 
   <template data-id="style">
     <div class="entry">
-      <div class="left-gutter">
-        <input class="checker" type="checkbox">
-      </div>
       <div class="main-controls">
-        <label class="style-name"></label>
-        <div class="actions">
-          <a href="#" class="enable" i18n-text="enableStyleLabel"></a>
-          <a href="#" class="disable" i18n-text="disableStyleLabel"></a>
-          <a class="style-edit-link" href="edit.html?id=" i18n-title="editStyleLabel">
-            <svg class="svg-icon edit" viewBox="0 0 14 16">
-              <path fill-rule="evenodd" d="M0 12v3h3l8-8-3-3-8 8zm3 2H1v-2h1v1h1v1zm10.3-9.3L12 6 9 3l1.3-1.3a.996.996 0 0 1 1.41 0l1.59 1.59c.39.39.39 1.02 0 1.41z"/>
+        <a class="style-name">
+		  <div class="left-gutter">
+            <input class="checker" type="checkbox">
+			<svg class="svg-icon checked" viewBox="0 0 1000 1000">
+              <path fill-rule="evenodd" d="M983.2,184.3L853,69.8c-4-3.5-9.3-5.3-14.5-5c-5.3,0.4-10.3,2.8-13.8,6.8L352.3,609.2L184.4,386.9c-3.2-4.2-8-7-13.2-7.8c-5.3-0.8-10.6,0.6-14.9,3.9L18,487.5c-8.8,6.7-10.6,19.3-3.9,28.1L325,927.2c3.6,4.8,9.3,7.7,15.3,8c0.2,0,0.5,0,0.7,0c5.8,0,11.3-2.5,15.1-6.8L985,212.6C992.3,204.3,991.5,191.6,983.2,184.3z"/>
             </svg>
-          </a>
-          <a href="#" class="delete" i18n-title="deleteStyleLabel">
-            <svg class="svg-icon remove" viewBox="0 0 14 16">
-              <path fill-rule="evenodd" d="M11 2H9c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1H2c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1v9c0 .55.45 1 1 1h7c.55 0 1-.45 1-1V5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 12H3V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9zm1-10H2V3h9v1z"/>
-            </svg>
-          </a>
-        </div>
+          </div>
+		</a>
+      </div>
+      <div class="actions">
+        <a href="#" class="enable" i18n-text="enableStyleLabel"></a>
+        <a href="#" class="disable" i18n-text="disableStyleLabel"></a>
+        <a class="style-edit-link" href="edit.html?id=" i18n-title="editStyleLabel">
+          <svg class="svg-icon edit" viewBox="0 0 14 16">
+            <path fill-rule="evenodd" d="M0 12v3h3l8-8-3-3-8 8zm3 2H1v-2h1v1h1v1zm10.3-9.3L12 6 9 3l1.3-1.3a.996.996 0 0 1 1.41 0l1.59 1.59c.39.39.39 1.02 0 1.41z"/>
+          </svg>
+        </a>
+        <a href="#" class="delete" i18n-title="deleteStyleLabel">
+          <svg class="svg-icon remove" viewBox="0 0 14 16">
+            <path fill-rule="evenodd" d="M11 2H9c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1H2c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1v9c0 .55.45 1 1 1h7c.55 0 1-.45 1-1V5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 12H3V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9zm1-10H2V3h9v1z"/>
+          </svg>
+        </a>
       </div>
     </div>
   </template>
@@ -102,33 +106,34 @@
 
   <div id="installed"></div>
 
-  <div class="actions">
-    <div id="disable-all-wrapper">
-      <div class="left-gutter">
-        <input id="disableAll" type="checkbox">
-      </div>
-      <div class="main-controls">
-        <label id="disableAll-label" for="disableAll" i18n-text="disableAllStyles"></label>
-      </div>
+  <div id="disable-all-wrapper">
+    <div class="left-gutter">
+      <input id="disableAll" type="checkbox">
+	  <svg class="svg-icon checked" viewBox="0 0 1000 1000">
+        <path fill-rule="evenodd" d="M983.2,184.3L853,69.8c-4-3.5-9.3-5.3-14.5-5c-5.3,0.4-10.3,2.8-13.8,6.8L352.3,609.2L184.4,386.9c-3.2-4.2-8-7-13.2-7.8c-5.3-0.8-10.6,0.6-14.9,3.9L18,487.5c-8.8,6.7-10.6,19.3-3.9,28.1L325,927.2c3.6,4.8,9.3,7.7,15.3,8c0.2,0,0.5,0,0.7,0c5.8,0,11.3-2.5,15.1-6.8L985,212.6C992.3,204.3,991.5,191.6,983.2,184.3z"/>
+      </svg>
+      <label id="disableAll-label" for="disableAll" i18n-text="disableAllStyles"></label>
     </div>
-    <div class="left-gutter"></div>
-    <div class="main-controls">
-      <div id="find-styles">
-        <a id="find-styles-link" href="#" i18n-text="findStylesForSite"></a>
-      </div>
-      <div id="write-style">
-        <span id="write-style-for" i18n-text="writeStyleFor"></span>
-      </div>
+  </div>
+  <div id="find-styles-wrapper">
+    <div id="find-styles">
+      <a id="find-styles-link" href="#" i18n-text="findStylesForSite"></a>
     </div>
-    <!-- Actions -->
-    <div id="popup-options">
-      <button id="popup-manage-button" i18n-text="openManage"
-              data-href="manage.html" i18n-title="popupManageTooltip"></button>
-      <button id="popup-options-button" i18n-text="openOptionsPopup"></button>
-      <button id="popup-shortcuts-button" class="chromium-only"
-              i18n-text="shortcuts"
-              i18n-title="shortcutsNote"></button>
+  </div>
+  <div id="write-style-wrapper">
+    <div id="write-style">
+      <span id="write-style-for" i18n-text="writeStyleFor"></span>
     </div>
   </div>
+  <!-- Actions -->
+  <div id="popup-manage-wrapper">
+    <button id="popup-manage-button" i18n-text="openManage" data-href="manage.html" i18n-title="popupManageTooltip"></button>
+  </div>
+  <div id="popup-options-wrapper">
+    <button id="popup-options-button" i18n-text="openOptionsPopup"></button>
+  </div>
+  <div id="popup-shortcuts-wrapper">
+    <button id="popup-shortcuts-button" class="chromium-only" i18n-text="shortcuts" i18n-title="shortcutsNote"></button>
+  </div>
 </body>
 </html>