diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs
index 89bbe2994..4f6ca819f 100644
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -63,7 +63,7 @@
       const folderActionsMenu = document.getElementById('zenFolderActions');
       folderActionsMenu.addEventListener('popupshowing', (event) => {
         const folder =
-          event.explicitOriginalTarget?.group || event.explicitOriginalTarget.parentElement?.group;
+          event.explicitOriginalTarget?.group || event.explicitOriginalTarget.parentElement;
         // We only want to rename zen-folders as firefox groups don't work well with this
         if (!folder?.isZenFolder) {
           return;
@@ -918,7 +918,7 @@
       if (!group) return;
 
       gZenEmojiPicker
-        .open(group.labelElement, { onlySvgIcons: true })
+        .open(group.icon, { onlySvgIcons: true })
         .then((icon) => {
           this.setFolderUserIcon(group, icon);
           group.dispatchEvent(new CustomEvent('ZenFolderIconChanged', { bubbles: true }));
diff --git a/src/zen/folders/zen-folders.css b/src/zen/folders/zen-folders.css
index ae47dc3d5..fe9769625 100644
--- a/src/zen/folders/zen-folders.css
+++ b/src/zen/folders/zen-folders.css
@@ -263,6 +263,10 @@ zen-folder {
         transition: 0.2s scale;
         transform-origin: right bottom;
 
+        :root:not([zen-sidebar-expanded]) & {
+          transform-origin: center bottom;
+        }
+
         & image {
           fill-opacity: 0.9;
           -moz-context-properties: fill, fill-opacity;
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 611830089..4470b8b51 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -1315,7 +1315,7 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
     if (this.workspaceHasIcon(workspace)) {
       return workspace.icon;
     }
-    return '';
+    return new Intl.Segmenter().segment(workspace.name).containing().segment.toUpperCase();
   }
 
   get shouldShowContainers() {