diff --git a/src/browser/base/content/zenThemeModifier.js b/src/browser/base/content/zenThemeModifier.js
index d1dd012bc..fcabb3b56 100644
--- a/src/browser/base/content/zenThemeModifier.js
+++ b/src/browser/base/content/zenThemeModifier.js
@@ -123,10 +123,6 @@ var ZenThemeModifier = {
     separator.id = kSeparatorId;
     newContainer.appendChild(separator);
 
-    // move the security button to the right
-    const securityButton = document.getElementById("tracking-protection-icon-container");
-    document.getElementsByClassName("urlbar-input-container")[0].insertBefore(securityButton, document.getElementById("page-action-buttons"));
-  
     gZenVerticalTabsManager.init();
 
     this._updateZenAvatar();
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index 052c5f323..e8d1c909e 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -180,6 +180,11 @@ toolbar .zen-sidebar-panel-button {
   margin-right: 0 !important;
 }
 
+#tracking-protection-icon-container,
+#page-action-buttons {
+  order: 2 !important;
+}
+
 #notification-popup-box {
   border-radius: 999px;
   margin-right: 5px;