diff --git a/popup.html b/popup.html
index 8fae9043..b0a097b0 100644
--- a/popup.html
+++ b/popup.html
@@ -16,15 +16,18 @@
         <input class="checker" type="checkbox">
       </div>
       <div class="main-controls">
-        <label class="style-name"></label>
+        <a class="style-name style-edit-link" href="edit.html?id=" i18n-title="editStyleLabel"></a>
         <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 href="#" class="enable" i18n-title="enableStyleLabel">
+		    <svg class="svg-icon off" viewBox="0 0 24 24">
+              <path fill-rule="evenodd" d="M13 3h-2v10h2V3zm4.83 2.17l-1.42 1.42C17.99 7.86 19 9.81 19 12c0 3.87-3.13 7-7 7s-7-3.13-7-7c0-2.19 1.01-4.14 2.58-5.42L6.17 5.17C4.23 6.82 3 9.26 3 12c0 4.97 4.03 9 9 9s9-4.03 9-9c0-2.74-1.23-5.18-3.17-6.83z"/>
             </svg>
           </a>
+          <a href="#" class="disable" i18n-title="disableStyleLabel">
+		    <svg class="svg-icon on" viewBox="0 0 24 24">
+              <path fill-rule="evenodd" d="M13 3h-2v10h2V3zm4.83 2.17l-1.42 1.42C17.99 7.86 19 9.81 19 12c0 3.87-3.13 7-7 7s-7-3.13-7-7c0-2.19 1.01-4.14 2.58-5.42L6.17 5.17C4.23 6.82 3 9.26 3 12c0 4.97 4.03 9 9 9s9-4.03 9-9c0-2.74-1.23-5.18-3.17-6.83z"/>
+            </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"/>
@@ -82,9 +85,13 @@
     <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 class="main-controls">
+          <label id="disableAll-label" for="disableAll" i18n-title="disableAllStyles">
+		    <svg class="svg-icon all-off" viewBox="0 0 24 24">
+              <path fill-rule="evenodd" d="M13 3h-2v10h2V3zm4.83 2.17l-1.42 1.42C17.99 7.86 19 9.81 19 12c0 3.87-3.13 7-7 7s-7-3.13-7-7c0-2.19 1.01-4.14 2.58-5.42L6.17 5.17C4.23 6.82 3 9.26 3 12c0 4.97 4.03 9 9 9s9-4.03 9-9c0-2.74-1.23-5.18-3.17-6.83z"/>
+            </svg>
+		  </label>
+        </div>
       </div>
     </div>
     <div class="left-gutter"></div>