diff --git a/src/css/popup.css b/src/css/popup.css
index fb88e334d..6ba365daa 100644
--- a/src/css/popup.css
+++ b/src/css/popup.css
@@ -342,7 +342,7 @@ body.dirty #refresh:hover {
     opacity: 0.7;
     background-color: #444;
     border-radius: 4px;
-    color: rgb(255, 213, 123);
+    color: rgba(255, 255, 255, 0.8);
     cursor: pointer;
     display: none;
     font-size: 35px;
diff --git a/src/img/icons.svg b/src/img/icons.svg
index c0c71abb5..c9afc85a3 100755
--- a/src/img/icons.svg
+++ b/src/img/icons.svg
@@ -1,8 +1,8 @@
 <svg display="none" width="0" height="0" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <defs>
-<symbol id="icon-lock" viewBox="0 0 1024 1024">
-    <title>lock</title>
-    <path class="path1" d="M749.715 511.999q22.857 0 38.857 16t16 38.857v329.143q0 22.857-16 38.857t-38.857 16h-548.571q-22.857 0-38.857-16t-16-38.857v-329.143q0-22.857 16-38.857t38.857-16h18.286v-182.857q0-105.714 75.143-180.857t180.857-75.143 180.857 75.143 75.143 180.857q0 14.857-10.857 25.714t-25.714 10.857h-36.571q-14.857 0-25.714-10.857t-10.857-25.714q0-60.571-42.857-103.429t-103.429-42.857-103.429 42.857-42.857 103.429v182.857h420.571z"></path>
+<symbol id="icon-save" viewBox="0 0 448 448">
+    <title>save</title>
+    <path class="path1" d="M128 384h192v-96h-192v96zM352 384h32v-224q0-3.5-2.5-9.625t-5-8.625l-70.25-70.25q-2.5-2.5-8.5-5t-9.75-2.5v104q0 10-7 17t-17 7h-144q-10 0-17-7t-7-17v-104h-32v320h32v-104q0-10 7-17t17-7h208q10 0 17 7t7 17v104zM256 152v-80q0-3.25-2.375-5.625t-5.625-2.375h-48q-3.25 0-5.625 2.375t-2.375 5.625v80q0 3.25 2.375 5.625t5.625 2.375h48q3.25 0 5.625-2.375t2.375-5.625zM416 160v232q0 10-7 17t-17 7h-336q-10 0-17-7t-7-17v-336q0-10 7-17t17-7h232q10 0 22 5t19 12l70 70q7 7 12 19t5 22z"></path>
 </symbol>
 <symbol id="icon-power" viewBox="0 0 1024 1024">
     <title>power</title>
diff --git a/src/js/popup.js b/src/js/popup.js
index fef1f2f6e..d21c77d4d 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -324,10 +324,13 @@ var buildAllFirewallRows = function() {
     // The padlock must be manually positioned:
     // - Its horizontal position depends on whether there is a vertical
     //   scrollbar.
+    updateAllFirewallCells();
+    setTimeout(updateDfButtonsPosition, 500);
+};
+
+var updateDfButtonsPosition = function() {
     var rect = document.getElementById('firewallContainer').getBoundingClientRect();
     document.getElementById('saveRules').style.setProperty('left', (rect.left + 4) + 'px');
-
-    updateAllFirewallCells();
 };
 
 /******************************************************************************/
diff --git a/src/popup.html b/src/popup.html
index cc36e5ca4..b935cb364 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -35,7 +35,7 @@
             <div><span data-i18n="popup1pScriptRulePrompt"></span><span data-src="/" data-des="*" data-type="1p-script"> </span><span data-src="." data-des="*" data-type="1p-script"> </span></div>
             <div><span data-i18n="popup3pScriptRulePrompt"></span><span data-src="/" data-des="*" data-type="3p-script"> </span><span data-src="." data-des="*" data-type="3p-script"> </span></div>
             <div><span data-i18n="popup3pFrameRulePrompt"></span><span data-src="/" data-des="*" data-type="3p-frame"> </span><span data-src="." data-des="*" data-type="3p-frame"> </span></div>
-            </div><div id="saveRules"><svg class="icon icon-lock"><use xlink:href="img/icons.svg#icon-lock"></use></svg></div>
+            </div><div id="saveRules"><svg class="icon icon-save"><use xlink:href="img/icons.svg#icon-save"></use></svg></div>
         </div>
     </div>