diff --git a/src/browser/base/content/ZenWorkspaces.mjs b/src/browser/base/content/ZenWorkspaces.mjs
index 4e286bbae..b5b82ef3e 100644
--- a/src/browser/base/content/ZenWorkspaces.mjs
+++ b/src/browser/base/content/ZenWorkspaces.mjs
@@ -166,11 +166,7 @@ var ZenWorkspaces = {
 
   _prepareNewWorkspace(window) {
     document.documentElement.setAttribute("zen-workspace-id", window.uuid);
-    for (let tab of gBrowser.tabs) {
-      if (!tab.getAttribute("zen-workspace-id")) {
-        tab.setAttribute("zen-workspace-id", window.uuid);
-      }
-    }
+    this._createNewTabForWorkspace(window);
   },
 
   _createNewTabForWorkspace(window) {
diff --git a/src/browser/base/content/zen-popupset.inc.xhtml b/src/browser/base/content/zen-popupset.inc.xhtml
index 07a34243f..f1de3d2f3 100644
--- a/src/browser/base/content/zen-popupset.inc.xhtml
+++ b/src/browser/base/content/zen-popupset.inc.xhtml
@@ -79,7 +79,12 @@
 <panel id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left">
   <vbox>
     <vbox>
-      <h3 data-l10n-id="zen-panel-ui-current-window-text"></h3>
+      <hbox>
+        <h3 data-l10n-id="zen-panel-ui-current-window-text"></h3>
+        <hbox class="translations-panel-beta" role="image" aria-label="Beta">
+          <image class="translations-panel-beta-icon"></image>
+        </hbox>
+      </hbox>
       <html:div id="PanelUI-zen-workspaces-current-info">
       </html:div>
     </vbox>
@@ -88,6 +93,8 @@
       <html:div id="PanelUI-zen-workspaces-list">
       </html:div>
     </vbox>
-    <toolbarbutton id="PanelUI-zen-workspaces-new" oncommand="ZenWorkspaces.createAndSaveWorkspace();" class="subviewbutton" data-l10n-id="zen-panel-ui-workspaces-new"></toolbarbutton>
+    <toolbarbutton id="PanelUI-zen-workspaces-new" oncommand="ZenWorkspaces.createAndSaveWorkspace();" class="subviewbutton">
+      <image></image>
+    </toolbarbutton>
   </vbox>
 </panel>
\ No newline at end of file
diff --git a/src/browser/locales/en-US/browser/zen-workspaces.ftl b/src/browser/locales/en-US/browser/zen-workspaces.ftl
index 04b2a5fc2..7787f723a 100644
--- a/src/browser/locales/en-US/browser/zen-workspaces.ftl
+++ b/src/browser/locales/en-US/browser/zen-workspaces.ftl
@@ -2,7 +2,3 @@
 zen-panel-ui-current-window-text = Current Window
 
 zen-panel-ui-workspaces-text = Other Workspaces
-
-zen-panel-ui-workspaces-new 
-  .label = New Workspace
-  .accesskey = N
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index f571ee8d4..70d0f1205 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -154,7 +154,7 @@
 #appMenu-zoomEnlarge-button2,
 #PanelUI-zen-profiles-newProfile,
 #zen-sidebar-add-panel-button,
-#PanelUI-zen-workspaces-new {
+#PanelUI-zen-workspaces-new image {
 	list-style-image: url("plus.svg") !important;
 }
 
diff --git a/src/browser/themes/shared/zen-panel-ui.css b/src/browser/themes/shared/zen-panel-ui.css
index 6d417002a..a767dc6dd 100644
--- a/src/browser/themes/shared/zen-panel-ui.css
+++ b/src/browser/themes/shared/zen-panel-ui.css
@@ -310,6 +310,7 @@
 #PanelUI-zen-workspaces-new {
   position: absolute;
   top: 10px;
+  min-height: 1px !important;
   right: 10px;
   padding: 3px;
   border-radius: 4px;