diff --git a/src/css/popup.css b/src/css/popup.css
index 58ea0f9e0..014c06a31 100644
--- a/src/css/popup.css
+++ b/src/css/popup.css
@@ -69,6 +69,7 @@ body, #panes {
     }
 body.portrait #panes > div {
     display: block;
+    width: 100%;
     }
 body[dir="ltr"] #panes > div {
     direction: ltr;
@@ -320,6 +321,10 @@ body.dirty #refresh:hover {
     font-size: 11.5px;
     text-align: center;
     }
+body.portrait #firewallContainer > div > span:nth-of-type(3),
+body.portrait #firewallContainer > div > span:nth-of-type(4) {
+    font-size: 9px;
+    }
 #firewallContainer > div > span:nth-of-type(4) {
     display: none;
     }
@@ -461,8 +466,10 @@ body.dirty #refresh:hover {
     border: 0;
     color: #888;
     display: none;
+    left: 4px;
     padding: 0;
-    position: fixed;
+    position: absolute;
+    top: 4px;
     }
 #rulesetTools > span {
     background-color: #ffe;
diff --git a/src/js/popup.js b/src/js/popup.js
index 408031c50..309d2b366 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -45,13 +45,6 @@ document.querySelector('#panes > div:nth-of-type(2)').style.setProperty(
     document.querySelector('#panes > div:nth-of-type(1)').offsetHeight + 'px'
 );
 
-// The padlock must be manually positioned:
-// - It's vertical position depends on the height on the title bar.
-document.getElementById('rulesetTools').style.setProperty(
-    'top',
-    (document.getElementById('gotoPrefs').getBoundingClientRect().bottom + 4) + 'px'
-);
-
 // https://github.com/chrisaljoudi/uBlock/issues/996
 // Experimental: mitigate glitchy popup UI: immediately set the firewall pane
 // visibility to its last known state. By default the pane is hidden.
@@ -325,12 +318,6 @@ var buildAllFirewallRows = function() {
         dfPaneBuilt = true;
     }
 
-    // The padlock must be manually positioned:
-    // - Its horizontal position depends on whether there is a vertical
-    //   scrollbar.
-    var rect = document.getElementById('firewallContainer').getBoundingClientRect();
-    document.getElementById('rulesetTools').style.setProperty('left', (rect.left + 4) + 'px');
-
     updateAllFirewallCells();
 };