diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index 612abc81e..53317969b 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit 612abc81e78ccdfbdf4d3c0bf6b37e94a87ed1c2
+Subproject commit 53317969bff9ca706a8ff452a351bba0922657c0
diff --git a/src/browser/base/content/zen-popupset.inc.xhtml b/src/browser/base/content/zen-popupset.inc.xhtml
index 57b919f7b..c74bf7e01 100644
--- a/src/browser/base/content/zen-popupset.inc.xhtml
+++ b/src/browser/base/content/zen-popupset.inc.xhtml
@@ -101,10 +101,6 @@
   </vbox>
 </panelview>
 
-<panel type="arrow" id="PanelUI-zen-workspaces-icon-picker" position="bottomright topright" side="left">
-
-</panel>
-
 <panel flip="slide" type="arrow" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left">
   <panelmultiview id="PanelUI-zen-workspaces-multiview" mainViewId="PanelUI-zen-workspaces-view">
     <panelview id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
@@ -158,6 +154,9 @@
       </html:moz-button-group>
     </panelview>
   </panelmultiview>
+  <panel type="arrow" role="menu" id="PanelUI-zen-workspaces-icon-picker" side="left">
+
+  </panel>
 </panel>
 
 <menupopup id="zenWorkspaceActionsMenu"