diff --git a/locales/ar/browser/browser/zen-folders.ftl b/locales/ar/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/ar/browser/browser/zen-folders.ftl
+++ b/locales/ar/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/ar/browser/browser/zen-general.ftl b/locales/ar/browser/browser/zen-general.ftl
index f91aba77d..5485491b3 100644
--- a/locales/ar/browser/browser/zen-general.ftl
+++ b/locales/ar/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = إلى المزيد تعرف
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/ar/browser/browser/zen-workspaces.ftl b/locales/ar/browser/browser/zen-workspaces.ftl
index cfb6f1a4a..0a4329d18 100644
--- a/locales/ar/browser/browser/zen-workspaces.ftl
+++ b/locales/ar/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = مساحات العمل
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = حذف مساحة العمل
     .accesskey = د
diff --git a/locales/ca/browser/browser/zen-folders.ftl b/locales/ca/browser/browser/zen-folders.ftl
index 8b2ae70df..b4f229d6f 100644
--- a/locales/ca/browser/browser/zen-folders.ftl
+++ b/locales/ca/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Cerca { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/ca/browser/browser/zen-general.ftl b/locales/ca/browser/browser/zen-general.ftl
index aef1f3ef8..ad51702ee 100644
--- a/locales/ca/browser/browser/zen-general.ftl
+++ b/locales/ca/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Més informació
 zen-close-label = Tanca
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cerca...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/ca/browser/browser/zen-workspaces.ftl b/locales/ca/browser/browser/zen-workspaces.ftl
index 4fccc8b51..5043d3d88 100644
--- a/locales/ca/browser/browser/zen-workspaces.ftl
+++ b/locales/ca/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Espais de treball
 zen-panel-ui-workspaces-create = 
     .label = Crea un espai
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Suprimeix l'espai de treball
     .accesskey = D
diff --git a/locales/cs/browser/browser/zen-folders.ftl b/locales/cs/browser/browser/zen-folders.ftl
index 7f4e94258..a7c5082e6 100644
--- a/locales/cs/browser/browser/zen-folders.ftl
+++ b/locales/cs/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Hledat { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/cs/browser/browser/zen-general.ftl b/locales/cs/browser/browser/zen-general.ftl
index 519ab1bdc..cd6557708 100644
--- a/locales/cs/browser/browser/zen-general.ftl
+++ b/locales/cs/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Zjistit více
 zen-close-label = Zavřít
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Hledat...
+zen-icons-picker-emoji = 
+    .label = Emodži
+zen-icons-picker-svg = 
+    .label = Ikony
diff --git a/locales/cs/browser/browser/zen-workspaces.ftl b/locales/cs/browser/browser/zen-workspaces.ftl
index d2be4fb83..7a7b75554 100644
--- a/locales/cs/browser/browser/zen-workspaces.ftl
+++ b/locales/cs/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Pracovní prostory
 zen-panel-ui-workspaces-create = 
     .label = Vytvořit prostor
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Odstranit pracovní prostor
     .accesskey = D
diff --git a/locales/cy/browser/browser/zen-folders.ftl b/locales/cy/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/cy/browser/browser/zen-folders.ftl
+++ b/locales/cy/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/cy/browser/browser/zen-general.ftl b/locales/cy/browser/browser/zen-general.ftl
index b80d7d4fa..d412c53ff 100644
--- a/locales/cy/browser/browser/zen-general.ftl
+++ b/locales/cy/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Cau
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/cy/browser/browser/zen-workspaces.ftl b/locales/cy/browser/browser/zen-workspaces.ftl
index d165dcaeb..33d0e2d95 100644
--- a/locales/cy/browser/browser/zen-workspaces.ftl
+++ b/locales/cy/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Delete Workspace
     .accesskey = D
diff --git a/locales/da/browser/browser/preferences/zen-preferences.ftl b/locales/da/browser/browser/preferences/zen-preferences.ftl
index 875d3a00a..7d1fb6869 100644
--- a/locales/da/browser/browser/preferences/zen-preferences.ftl
+++ b/locales/da/browser/browser/preferences/zen-preferences.ftl
@@ -197,7 +197,7 @@ zen-picture-in-picture-toggle-shortcut-mac = Slå Billede-i-Billede Til/Fra (Mac
 zen-picture-in-picture-toggle-shortcut-mac-alt = Slå Billede-i-Billede Til/Fra (Mac Alt)
 zen-page-source-shortcut-safari = Vis Sidekilde (Safari)
 zen-nav-stop-shortcut = Stop Indlæsning
-zen-history-sidebar-shortcut = Show History Sidebar
+zen-history-sidebar-shortcut = Vis sidepanel for historik
 zen-window-minimize-shortcut = Minimer Vindue
 zen-help-shortcut = Åbn Hjælp
 zen-preferences-shortcut = Åbn Indstillinger
@@ -208,9 +208,9 @@ zen-search-focus-shortcut-alt = Fokuseret Søgning (Alt)
 zen-downloads-shortcut = Open Downloads
 zen-addons-shortcut = Åbn tilføjelser
 zen-file-open-shortcut = Åbn fil
-zen-save-page-shortcut = Save Page
-zen-print-shortcut = Print Page
-zen-close-shortcut-2 = Close Tab
+zen-save-page-shortcut = Gem side
+zen-print-shortcut = Udskriv side
+zen-close-shortcut-2 = Luk fane
 zen-mute-toggle-shortcut = Slå Lyden Til/Fra
 zen-key-delete = Slet nøgle
 zen-key-go-back = Gå tilbage
@@ -233,12 +233,12 @@ zen-find-shortcut = Find på side
 zen-search-find-again-shortcut = Find igen
 zen-search-find-again-shortcut-prev = Find forrige
 zen-search-find-again-shortcut-2 = Find igen (Alt)
-zen-bookmark-this-page-shortcut = Bookmark This Page
+zen-bookmark-this-page-shortcut = Bogmærk denne side
 zen-bookmark-show-library-shortcut = Vis Bogmærkebibliotek
 zen-key-stop = Stop indlæsning
-zen-full-zoom-reduce-shortcut = Zoom Out
-zen-full-zoom-enlarge-shortcut = Zoom In
-zen-full-zoom-reset-shortcut = Reset Zoom
+zen-full-zoom-reduce-shortcut = Zoom ud
+zen-full-zoom-enlarge-shortcut = Zoom ind
+zen-full-zoom-reset-shortcut = Nulstil zoom
 zen-full-zoom-reset-shortcut-alt = Nulstil zoom (Alt)
 zen-full-zoom-enlarge-shortcut-alt = Zoom ind (Alt)
 zen-full-zoom-enlarge-shortcut-alt2 = Zoom ind (Alt 2)
@@ -246,13 +246,13 @@ zen-bidi-switch-direction-shortcut = Skift tekstretning
 zen-private-browsing-shortcut = Privat browsing
 zen-screenshot-shortcut = Tag skærmbillede
 zen-key-sanitize = Ryd browserdata
-zen-quit-app-shortcut = Quit Application
+zen-quit-app-shortcut = Afslut applikation
 zen-key-wr-capture-cmd = WR-optagelseskommando
 zen-key-wr-toggle-capture-sequence-cmd = Slå WR-optagelsessekvens Til/Fra
 zen-nav-reload-shortcut = Genindlæs side
 zen-nav-reload-shortcut-skip-cache = Genindlæs Side (Spring Cache Over)
-zen-close-shortcut = Close Window
-zen-close-tab-shortcut = Close Tab
+zen-close-shortcut = Luk vindue
+zen-close-tab-shortcut = Luk fane
 zen-compact-mode-shortcut-show-sidebar = Flydende sidepanel til/fra
 zen-compact-mode-shortcut-show-toolbar = Flydende værktøjslinje til/fra
 zen-compact-mode-shortcut-toggle = Toggle Compact Mode
@@ -273,7 +273,7 @@ zen-pinned-tab-shortcut-reset = Nulstil fastgjort fane til fastgjort URL
 zen-split-view-shortcut-grid = Opdelt visning i gitter til/fra
 zen-split-view-shortcut-vertical = Lodret opdelt visning til/fra
 zen-split-view-shortcut-horizontal = Vandret opdelt visning til/fra
-zen-split-view-shortcut-unsplit = Close Split View
+zen-split-view-shortcut-unsplit = Luk opdelt visning
 zen-key-select-tab-1 = Vælg fane #1
 zen-key-select-tab-2 = Vælg fane #2
 zen-key-select-tab-3 = Vælg fane #3
diff --git a/locales/da/browser/browser/zen-folders.ftl b/locales/da/browser/browser/zen-folders.ftl
index db37b347a..480d6fa2a 100644
--- a/locales/da/browser/browser/zen-folders.ftl
+++ b/locales/da/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
-    .placeholder = Search { $folder-name }...
+    .placeholder = Søg i { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/da/browser/browser/zen-general.ftl b/locales/da/browser/browser/zen-general.ftl
index b866fa82e..ab69a2e05 100644
--- a/locales/da/browser/browser/zen-general.ftl
+++ b/locales/da/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Lær mere
 zen-close-label = Luk
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Søg...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/da/browser/browser/zen-workspaces.ftl b/locales/da/browser/browser/zen-workspaces.ftl
index 3f6947473..bdb0e9698 100644
--- a/locales/da/browser/browser/zen-workspaces.ftl
+++ b/locales/da/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Arbejdsområder
 zen-panel-ui-workspaces-create = 
     .label = Opret rum
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Slet arbejdsområde
     .accesskey = D
diff --git a/locales/de/browser/browser/zen-folders.ftl b/locales/de/browser/browser/zen-folders.ftl
index c1906ac9d..668679641 100644
--- a/locales/de/browser/browser/zen-folders.ftl
+++ b/locales/de/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = { $folder-name } durchsuchen...
+zen-folders-panel-rename-folder = 
+    .label = Ordner umbenennen
+zen-folders-panel-expand-folder = 
+    .label = Ordner ausklappen
+zen-folders-panel-delete-folder = 
+    .label = Ordner löschen
+zen-folders-panel-convert-folder-to-space = 
+    .label = Ordner in Arbeitsbereich konvertieren
+zen-folders-panel-change-folder-space = 
+    .label = Arbeitsbereich wechseln...
+zen-folders-panel-change-icon-folder = 
+    .label = Symbol anpassen
+zen-folders-search-no-results = Keine Tabs passend zu dieser Suche 🤔
diff --git a/locales/de/browser/browser/zen-general.ftl b/locales/de/browser/browser/zen-general.ftl
index 86d0bf8d1..bcb18b2e6 100644
--- a/locales/de/browser/browser/zen-general.ftl
+++ b/locales/de/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Mehr erfahren
 zen-close-label = Schließen
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Suchen...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Symbole
diff --git a/locales/de/browser/browser/zen-split-view.ftl b/locales/de/browser/browser/zen-split-view.ftl
index d3c3aad16..2a4be1d17 100644
--- a/locales/de/browser/browser/zen-split-view.ftl
+++ b/locales/de/browser/browser/zen-split-view.ftl
@@ -1,8 +1,8 @@
 tab-zen-split-tabs = 
     .label =
         { $tabCount ->
-        [1] Tab aufteilen (mehrere ausgewählte Tabs erforderlich)
-        *[other] { $tabCount } Tabs aufteilen
+            [1] Tab aufteilen (mehrere ausgewählte Tabs erforderlich)
+           *[other] { $tabCount } Tabs aufteilen
         }
     .accesskey = S
 zen-split-link = 
diff --git a/locales/de/browser/browser/zen-vertical-tabs.ftl b/locales/de/browser/browser/zen-vertical-tabs.ftl
index 46f98ee58..73519fce6 100644
--- a/locales/de/browser/browser/zen-vertical-tabs.ftl
+++ b/locales/de/browser/browser/zen-vertical-tabs.ftl
@@ -24,13 +24,13 @@ sidebar-zen-create-new =
 tabbrowser-unload-tab-button = 
     .tooltiptext =
         { $tabCount ->
-        [one] Tab entladen und dorthin wechseln
-        *[other] { $tabCount } Tabs entladen und zum ersten wechseln
+            [one] Tab entladen und dorthin wechseln
+           *[other] { $tabCount } Tabs entladen und zum ersten wechseln
         }
 tabbrowser-reset-pin-button = 
     .tooltiptext =
         { $tabCount ->
-        [one] Tab zurücksetzen und anpinnen
-        *[other] { $tabCount } Tabs zurücksetzen und anpinnen
+            [one] Tab zurücksetzen und anpinnen
+           *[other] { $tabCount } Tabs zurücksetzen und anpinnen
         }
 tab-reset-pin-label = Zurück zur angepinnten URL
diff --git a/locales/de/browser/browser/zen-workspaces.ftl b/locales/de/browser/browser/zen-workspaces.ftl
index 87fd4d5cf..24b7e2de7 100644
--- a/locales/de/browser/browser/zen-workspaces.ftl
+++ b/locales/de/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Arbeitsbereiche
 zen-panel-ui-workspaces-create = 
     .label = Arbeitsbereich erstellen
+zen-panel-ui-folder-create = 
+    .label = Ordner erstellen
 zen-workspaces-panel-context-delete = 
     .label = Arbeitsbereich löschen
     .accesskey = D
diff --git a/locales/el/browser/browser/zen-folders.ftl b/locales/el/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/el/browser/browser/zen-folders.ftl
+++ b/locales/el/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/el/browser/browser/zen-general.ftl b/locales/el/browser/browser/zen-general.ftl
index cffa13167..4037dff9d 100644
--- a/locales/el/browser/browser/zen-general.ftl
+++ b/locales/el/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Μάθετε Περισσότερα
 zen-close-label = Κλείσιμο
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Αναζήτηση...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/el/browser/browser/zen-workspaces.ftl b/locales/el/browser/browser/zen-workspaces.ftl
index 5a0a3eb68..92f9abf59 100644
--- a/locales/el/browser/browser/zen-workspaces.ftl
+++ b/locales/el/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Χώροι Εργασίας
 zen-panel-ui-workspaces-create = 
     .label = Δημιουργία Χώρου
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Διαγραφή Χώρου Εργασίας
     .accesskey = D
diff --git a/locales/en-GB/browser/browser/zen-folders.ftl b/locales/en-GB/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/en-GB/browser/browser/zen-folders.ftl
+++ b/locales/en-GB/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/en-GB/browser/browser/zen-general.ftl b/locales/en-GB/browser/browser/zen-general.ftl
index 459518b10..b3d7b1dbc 100644
--- a/locales/en-GB/browser/browser/zen-general.ftl
+++ b/locales/en-GB/browser/browser/zen-general.ftl
@@ -42,3 +42,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/en-GB/browser/browser/zen-workspaces.ftl b/locales/en-GB/browser/browser/zen-workspaces.ftl
index 8aa815502..aa94c6cb7 100644
--- a/locales/en-GB/browser/browser/zen-workspaces.ftl
+++ b/locales/en-GB/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Other workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Delete Workspace
     .accesskey = D
diff --git a/locales/es-ES/browser/browser/zen-folders.ftl b/locales/es-ES/browser/browser/zen-folders.ftl
index f30da8764..0d0f5617b 100644
--- a/locales/es-ES/browser/browser/zen-folders.ftl
+++ b/locales/es-ES/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Buscar { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Renombrar carpeta
+zen-folders-panel-expand-folder = 
+    .label = Expandir carpeta
+zen-folders-panel-delete-folder = 
+    .label = Borrar carpeta
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convertir carpeta en espacio
+zen-folders-panel-change-folder-space = 
+    .label = Cambiar espacio...
+zen-folders-panel-change-icon-folder = 
+    .label = Cambiar icono
+zen-folders-search-no-results = Ninguna pestaña coincide con esa búsqueda 🤔
diff --git a/locales/es-ES/browser/browser/zen-general.ftl b/locales/es-ES/browser/browser/zen-general.ftl
index ced32570e..43ef5a7b2 100644
--- a/locales/es-ES/browser/browser/zen-general.ftl
+++ b/locales/es-ES/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Más información
 zen-close-label = Cerrar
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Buscar...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Iconos
diff --git a/locales/es-ES/browser/browser/zen-workspaces.ftl b/locales/es-ES/browser/browser/zen-workspaces.ftl
index 81c3fb439..97b4277ef 100644
--- a/locales/es-ES/browser/browser/zen-workspaces.ftl
+++ b/locales/es-ES/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Espacios de trabajo
 zen-panel-ui-workspaces-create = 
     .label = Crear espacio
+zen-panel-ui-folder-create = 
+    .label = Crear carpeta
 zen-workspaces-panel-context-delete = 
     .label = Eliminar espacio de trabajo
     .accesskey = D
diff --git a/locales/et/browser/browser/zen-folders.ftl b/locales/et/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/et/browser/browser/zen-folders.ftl
+++ b/locales/et/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/et/browser/browser/zen-general.ftl b/locales/et/browser/browser/zen-general.ftl
index cf0b65593..9b824e30e 100644
--- a/locales/et/browser/browser/zen-general.ftl
+++ b/locales/et/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Rohkem teavet
 zen-close-label = Sulge
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/et/browser/browser/zen-workspaces.ftl b/locales/et/browser/browser/zen-workspaces.ftl
index f7b1d4fe2..d01acea24 100644
--- a/locales/et/browser/browser/zen-workspaces.ftl
+++ b/locales/et/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Tööruumid
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Kustuta tööruum
     .accesskey = K
diff --git a/locales/fa/browser/browser/zen-folders.ftl b/locales/fa/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/fa/browser/browser/zen-folders.ftl
+++ b/locales/fa/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/fa/browser/browser/zen-general.ftl b/locales/fa/browser/browser/zen-general.ftl
index de4decf02..eda561acf 100644
--- a/locales/fa/browser/browser/zen-general.ftl
+++ b/locales/fa/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/fa/browser/browser/zen-workspaces.ftl b/locales/fa/browser/browser/zen-workspaces.ftl
index d56a360a4..720e7d45f 100644
--- a/locales/fa/browser/browser/zen-workspaces.ftl
+++ b/locales/fa/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = دیگر فضاهای کاری
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = حذف فضای کاری
     .accesskey = D
diff --git a/locales/fi/browser/browser/zen-folders.ftl b/locales/fi/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/fi/browser/browser/zen-folders.ftl
+++ b/locales/fi/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/fi/browser/browser/zen-general.ftl b/locales/fi/browser/browser/zen-general.ftl
index e0fa30a77..a06036cb9 100644
--- a/locales/fi/browser/browser/zen-general.ftl
+++ b/locales/fi/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/fi/browser/browser/zen-workspaces.ftl b/locales/fi/browser/browser/zen-workspaces.ftl
index 22fcf6ab9..ac50ed92e 100644
--- a/locales/fi/browser/browser/zen-workspaces.ftl
+++ b/locales/fi/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Työtilat
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Poista Työtila
     .accesskey = D
diff --git a/locales/fr/browser/browser/zen-folders.ftl b/locales/fr/browser/browser/zen-folders.ftl
index 22f733b7e..7a1b8085c 100644
--- a/locales/fr/browser/browser/zen-folders.ftl
+++ b/locales/fr/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Rechercher dans { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Renommer le dossier
+zen-folders-panel-expand-folder = 
+    .label = Développer le dossier
+zen-folders-panel-delete-folder = 
+    .label = Supprimer le dossier
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convertir le dossier en Espace
+zen-folders-panel-change-folder-space = 
+    .label = Changer d'Espace...
+zen-folders-panel-change-icon-folder = 
+    .label = Changer d'icône
+zen-folders-search-no-results = Aucun onglet ne correspond à cette recherche 🤔
diff --git a/locales/fr/browser/browser/zen-general.ftl b/locales/fr/browser/browser/zen-general.ftl
index ab2555ea0..3142b3e4a 100644
--- a/locales/fr/browser/browser/zen-general.ftl
+++ b/locales/fr/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = En savoir plus
 zen-close-label = Fermer
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Rechercher...
+zen-icons-picker-emoji = 
+    .label = Émojis
+zen-icons-picker-svg = 
+    .label = Icônes
diff --git a/locales/fr/browser/browser/zen-workspaces.ftl b/locales/fr/browser/browser/zen-workspaces.ftl
index 17a7942a2..d2c8da413 100644
--- a/locales/fr/browser/browser/zen-workspaces.ftl
+++ b/locales/fr/browser/browser/zen-workspaces.ftl
@@ -1,13 +1,15 @@
 zen-panel-ui-workspaces-text = Espaces
 zen-panel-ui-workspaces-create = 
     .label = Créer un Espace
+zen-panel-ui-folder-create = 
+    .label = Créer un dossier
 zen-workspaces-panel-context-delete = 
     .label = Supprimer l’Espace
     .accesskey = D
 zen-workspaces-panel-change-name = 
     .label = Modifier le nom
 zen-workspaces-panel-change-icon = 
-    .label = Changer l'icône
+    .label = Changer d'icône
 zen-workspaces-panel-context-default-profile = 
     .label = Définir le profil
 zen-workspaces-how-to-reorder-title = Comment réordonner les Espaces
diff --git a/locales/ga-IE/browser/browser/zen-folders.ftl b/locales/ga-IE/browser/browser/zen-folders.ftl
index 0de2c4960..11a8be2ec 100644
--- a/locales/ga-IE/browser/browser/zen-folders.ftl
+++ b/locales/ga-IE/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Cuardaigh { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/ga-IE/browser/browser/zen-general.ftl b/locales/ga-IE/browser/browser/zen-general.ftl
index e4a2e4bcb..06620ced4 100644
--- a/locales/ga-IE/browser/browser/zen-general.ftl
+++ b/locales/ga-IE/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Foghlaim Tuilleadh
 zen-close-label = Dún
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cuardaigh...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/ga-IE/browser/browser/zen-workspaces.ftl b/locales/ga-IE/browser/browser/zen-workspaces.ftl
index 2379c925b..aac49d2ab 100644
--- a/locales/ga-IE/browser/browser/zen-workspaces.ftl
+++ b/locales/ga-IE/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Spásanna
 zen-panel-ui-workspaces-create = 
     .label = Cruthaigh Spás
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Scrios Spás
     .accesskey = D
diff --git a/locales/he/browser/browser/zen-folders.ftl b/locales/he/browser/browser/zen-folders.ftl
index 6beada4a2..925881d46 100644
--- a/locales/he/browser/browser/zen-folders.ftl
+++ b/locales/he/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = חיפוש { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/he/browser/browser/zen-general.ftl b/locales/he/browser/browser/zen-general.ftl
index a7f85f20a..f92e77d3e 100644
--- a/locales/he/browser/browser/zen-general.ftl
+++ b/locales/he/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = מידע נוסף
 zen-close-label = סגור
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = חיפוש...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/he/browser/browser/zen-workspaces.ftl b/locales/he/browser/browser/zen-workspaces.ftl
index 688e5e9cb..0d0c34b3c 100644
--- a/locales/he/browser/browser/zen-workspaces.ftl
+++ b/locales/he/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = סביבות עבודה
 zen-panel-ui-workspaces-create = 
     .label = צור סביבה
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = מחק סיבת עבודה
     .accesskey = ג
diff --git a/locales/hu/browser/browser/zen-folders.ftl b/locales/hu/browser/browser/zen-folders.ftl
index 999237da3..05c1d37fc 100644
--- a/locales/hu/browser/browser/zen-folders.ftl
+++ b/locales/hu/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Keresés { $folder-name } mappában...
+zen-folders-panel-rename-folder = 
+    .label = Mappa átnevezése
+zen-folders-panel-expand-folder = 
+    .label = Mappa kinyitása
+zen-folders-panel-delete-folder = 
+    .label = Mappa törlése
+zen-folders-panel-convert-folder-to-space = 
+    .label = Mappa konvertálása munkakörnyezeté
+zen-folders-panel-change-folder-space = 
+    .label = Környezet váltása...
+zen-folders-panel-change-icon-folder = 
+    .label = Ikon módosítása
+zen-folders-search-no-results = Nincsenek a keresésnek megfelelő lapok 🤔
diff --git a/locales/hu/browser/browser/zen-general.ftl b/locales/hu/browser/browser/zen-general.ftl
index ba1885418..0fe870fba 100644
--- a/locales/hu/browser/browser/zen-general.ftl
+++ b/locales/hu/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Tudjon meg többet
 zen-close-label = Bezárás
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Keresés...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/hu/browser/browser/zen-workspaces.ftl b/locales/hu/browser/browser/zen-workspaces.ftl
index 812722982..041c287e1 100644
--- a/locales/hu/browser/browser/zen-workspaces.ftl
+++ b/locales/hu/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Más munkakörnyezetek
 zen-panel-ui-workspaces-create = 
     .label = Környezet létrehozása
+zen-panel-ui-folder-create = 
+    .label = Mappa létrehozása
 zen-workspaces-panel-context-delete = 
     .label = Munkakörnyezet törlése
     .accesskey = D
diff --git a/locales/id/browser/browser/zen-folders.ftl b/locales/id/browser/browser/zen-folders.ftl
index 40b8a2c30..ac2d9b7c3 100644
--- a/locales/id/browser/browser/zen-folders.ftl
+++ b/locales/id/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Cari { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/id/browser/browser/zen-general.ftl b/locales/id/browser/browser/zen-general.ftl
index 08611e8fe..1bebc0eac 100644
--- a/locales/id/browser/browser/zen-general.ftl
+++ b/locales/id/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Pelajari Lebih Lanjut
 zen-close-label = Tutup
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cari...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/id/browser/browser/zen-workspaces.ftl b/locales/id/browser/browser/zen-workspaces.ftl
index e1ef45b64..3f73a163f 100644
--- a/locales/id/browser/browser/zen-workspaces.ftl
+++ b/locales/id/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Ruang Kerja Lainnya
 zen-panel-ui-workspaces-create = 
     .label = Buat Ruang
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Hapus Ruang Kerja
     .accesskey = D
diff --git a/locales/is/browser/browser/zen-folders.ftl b/locales/is/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/is/browser/browser/zen-folders.ftl
+++ b/locales/is/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/is/browser/browser/zen-general.ftl b/locales/is/browser/browser/zen-general.ftl
index ffb862456..8ca789e0e 100644
--- a/locales/is/browser/browser/zen-general.ftl
+++ b/locales/is/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Læra Meira
 zen-close-label = Loka
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/is/browser/browser/zen-workspaces.ftl b/locales/is/browser/browser/zen-workspaces.ftl
index d165dcaeb..33d0e2d95 100644
--- a/locales/is/browser/browser/zen-workspaces.ftl
+++ b/locales/is/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Delete Workspace
     .accesskey = D
diff --git a/locales/it/browser/browser/zen-folders.ftl b/locales/it/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/it/browser/browser/zen-folders.ftl
+++ b/locales/it/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/it/browser/browser/zen-general.ftl b/locales/it/browser/browser/zen-general.ftl
index dc738b829..717f8120d 100644
--- a/locales/it/browser/browser/zen-general.ftl
+++ b/locales/it/browser/browser/zen-general.ftl
@@ -42,3 +42,7 @@ zen-learn-more-text = Scopri di più
 zen-close-label = Chiudi
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Cerca...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/it/browser/browser/zen-workspaces.ftl b/locales/it/browser/browser/zen-workspaces.ftl
index a070fd0cf..4c03c2d06 100644
--- a/locales/it/browser/browser/zen-workspaces.ftl
+++ b/locales/it/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Workspace
 zen-panel-ui-workspaces-create = 
     .label = Crea Spazio
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Elimina lo spazio di lavoro
     .accesskey = D
diff --git a/locales/ja/browser/browser/zen-folders.ftl b/locales/ja/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/ja/browser/browser/zen-folders.ftl
+++ b/locales/ja/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/ja/browser/browser/zen-general.ftl b/locales/ja/browser/browser/zen-general.ftl
index db638b1ee..4a8e4c592 100644
--- a/locales/ja/browser/browser/zen-general.ftl
+++ b/locales/ja/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = 閉じる
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/ja/browser/browser/zen-workspaces.ftl b/locales/ja/browser/browser/zen-workspaces.ftl
index 43b5be0b0..a8d021c4a 100644
--- a/locales/ja/browser/browser/zen-workspaces.ftl
+++ b/locales/ja/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = ワークスペース
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = ワークスペースを削除
     .accesskey = D
diff --git a/locales/ko/browser/browser/zen-folders.ftl b/locales/ko/browser/browser/zen-folders.ftl
index dc9df912d..3b81f8295 100644
--- a/locales/ko/browser/browser/zen-folders.ftl
+++ b/locales/ko/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = { $folder-name } 검색...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/ko/browser/browser/zen-general.ftl b/locales/ko/browser/browser/zen-general.ftl
index 3698bcd0a..712042df0 100644
--- a/locales/ko/browser/browser/zen-general.ftl
+++ b/locales/ko/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = 더 알아보기
 zen-close-label = 닫기
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = 검색...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/ko/browser/browser/zen-workspaces.ftl b/locales/ko/browser/browser/zen-workspaces.ftl
index c7feb53a1..c00b265fd 100644
--- a/locales/ko/browser/browser/zen-workspaces.ftl
+++ b/locales/ko/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = 다른 워크스페이스
 zen-panel-ui-workspaces-create = 
     .label = 스페이스 만들기
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = 워크스페이스 삭제
     .accesskey = D
diff --git a/locales/lt/browser/browser/zen-folders.ftl b/locales/lt/browser/browser/zen-folders.ftl
index 7f5c62d76..711cc8e9c 100644
--- a/locales/lt/browser/browser/zen-folders.ftl
+++ b/locales/lt/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Ieškoti „{ $folder-name }“...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/lt/browser/browser/zen-general.ftl b/locales/lt/browser/browser/zen-general.ftl
index a30882852..7ec1ccbb3 100644
--- a/locales/lt/browser/browser/zen-general.ftl
+++ b/locales/lt/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Sužinoti daugiau
 zen-close-label = Užverti
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Ieškokite...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/lt/browser/browser/zen-workspaces.ftl b/locales/lt/browser/browser/zen-workspaces.ftl
index 1940f21c8..e6723ea37 100644
--- a/locales/lt/browser/browser/zen-workspaces.ftl
+++ b/locales/lt/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Darbo sritys
 zen-panel-ui-workspaces-create = 
     .label = Kurti erdvę
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Ištrinti darbo sritį
     .accesskey = D
diff --git a/locales/nl/browser/browser/zen-folders.ftl b/locales/nl/browser/browser/zen-folders.ftl
index ef16a8b48..5af2e08fc 100644
--- a/locales/nl/browser/browser/zen-folders.ftl
+++ b/locales/nl/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Zoek { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/nl/browser/browser/zen-general.ftl b/locales/nl/browser/browser/zen-general.ftl
index 0e81128b4..0365542d0 100644
--- a/locales/nl/browser/browser/zen-general.ftl
+++ b/locales/nl/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Meer leren
 zen-close-label = Sluiten
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Zoeken…
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/nl/browser/browser/zen-workspaces.ftl b/locales/nl/browser/browser/zen-workspaces.ftl
index 86d3f80cf..4e1b32eb2 100644
--- a/locales/nl/browser/browser/zen-workspaces.ftl
+++ b/locales/nl/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Ruimtes
 zen-panel-ui-workspaces-create = 
     .label = Ruimte aanmaken
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Ruimte verwijderen
     .accesskey = D
diff --git a/locales/nn-NO/browser/browser/zen-folders.ftl b/locales/nn-NO/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/nn-NO/browser/browser/zen-folders.ftl
+++ b/locales/nn-NO/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/nn-NO/browser/browser/zen-general.ftl b/locales/nn-NO/browser/browser/zen-general.ftl
index 0771fd2c2..a974612ac 100644
--- a/locales/nn-NO/browser/browser/zen-general.ftl
+++ b/locales/nn-NO/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/nn-NO/browser/browser/zen-workspaces.ftl b/locales/nn-NO/browser/browser/zen-workspaces.ftl
index 44221c35e..9674444b8 100644
--- a/locales/nn-NO/browser/browser/zen-workspaces.ftl
+++ b/locales/nn-NO/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Other Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Delete Workspace
     .accesskey = D
diff --git a/locales/pl/browser/browser/zen-folders.ftl b/locales/pl/browser/browser/zen-folders.ftl
index 4ca8c6e51..716c4a828 100644
--- a/locales/pl/browser/browser/zen-folders.ftl
+++ b/locales/pl/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Wyszukaj { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/pl/browser/browser/zen-general.ftl b/locales/pl/browser/browser/zen-general.ftl
index 01385613e..50bdcd68a 100644
--- a/locales/pl/browser/browser/zen-general.ftl
+++ b/locales/pl/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Dowiedz się więcej
 zen-close-label = Zamknij
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Szukaj...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/pl/browser/browser/zen-workspaces.ftl b/locales/pl/browser/browser/zen-workspaces.ftl
index 610216fe8..85bd35b60 100644
--- a/locales/pl/browser/browser/zen-workspaces.ftl
+++ b/locales/pl/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Obszary robocze
 zen-panel-ui-workspaces-create = 
     .label = Utwórz Przestrzeń
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Usuń obszar roboczy
     .accesskey = D
diff --git a/locales/pt-BR/browser/browser/zen-folders.ftl b/locales/pt-BR/browser/browser/zen-folders.ftl
index b3db138f5..9a63ad8d1 100644
--- a/locales/pt-BR/browser/browser/zen-folders.ftl
+++ b/locales/pt-BR/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Pesquisar em { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/pt-BR/browser/browser/zen-general.ftl b/locales/pt-BR/browser/browser/zen-general.ftl
index bd284a53f..86f463c74 100644
--- a/locales/pt-BR/browser/browser/zen-general.ftl
+++ b/locales/pt-BR/browser/browser/zen-general.ftl
@@ -42,3 +42,7 @@ zen-learn-more-text = Saiba Mais
 zen-close-label = Fechar
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Pesquisar...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/pt-BR/browser/browser/zen-workspaces.ftl b/locales/pt-BR/browser/browser/zen-workspaces.ftl
index c97605b1f..7e2142dd6 100644
--- a/locales/pt-BR/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-BR/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Espaços
 zen-panel-ui-workspaces-create = 
     .label = Criar Espaço
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Excluir Espaço
     .accesskey = D
diff --git a/locales/pt-PT/browser/browser/zen-folders.ftl b/locales/pt-PT/browser/browser/zen-folders.ftl
index b3db138f5..9a63ad8d1 100644
--- a/locales/pt-PT/browser/browser/zen-folders.ftl
+++ b/locales/pt-PT/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Pesquisar em { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/pt-PT/browser/browser/zen-general.ftl b/locales/pt-PT/browser/browser/zen-general.ftl
index 6fedcf1ca..f61f2dc94 100644
--- a/locales/pt-PT/browser/browser/zen-general.ftl
+++ b/locales/pt-PT/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Saber Mais
 zen-close-label = Fechar
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Pesquisar...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/pt-PT/browser/browser/zen-workspaces.ftl b/locales/pt-PT/browser/browser/zen-workspaces.ftl
index 86234f69a..bf330431a 100644
--- a/locales/pt-PT/browser/browser/zen-workspaces.ftl
+++ b/locales/pt-PT/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Espaços de Trabalho
 zen-panel-ui-workspaces-create = 
     .label = Criar Espaço
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Eliminar Espaço de Trabalho
     .accesskey = D
diff --git a/locales/ru/browser/browser/zen-folders.ftl b/locales/ru/browser/browser/zen-folders.ftl
index 98663ea80..68a07cd8f 100644
--- a/locales/ru/browser/browser/zen-folders.ftl
+++ b/locales/ru/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Искать { $folder-name }…
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/ru/browser/browser/zen-general.ftl b/locales/ru/browser/browser/zen-general.ftl
index ccba9a89f..f894e9d2d 100644
--- a/locales/ru/browser/browser/zen-general.ftl
+++ b/locales/ru/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Узнать больше
 zen-close-label = Закрыть
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Найти...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/ru/browser/browser/zen-workspaces.ftl b/locales/ru/browser/browser/zen-workspaces.ftl
index b6b9d3b3c..35b0f2a4a 100644
--- a/locales/ru/browser/browser/zen-workspaces.ftl
+++ b/locales/ru/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Рабочие пространства
 zen-panel-ui-workspaces-create = 
     .label = Создать пространство
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Удалить пространство
     .accesskey = D
diff --git a/locales/sv-SE/browser/browser/zen-folders.ftl b/locales/sv-SE/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/sv-SE/browser/browser/zen-folders.ftl
+++ b/locales/sv-SE/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/sv-SE/browser/browser/zen-general.ftl b/locales/sv-SE/browser/browser/zen-general.ftl
index 18c4cfec0..478c85d18 100644
--- a/locales/sv-SE/browser/browser/zen-general.ftl
+++ b/locales/sv-SE/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Sök...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/sv-SE/browser/browser/zen-workspaces.ftl b/locales/sv-SE/browser/browser/zen-workspaces.ftl
index 9c89264a7..1346fd2d0 100644
--- a/locales/sv-SE/browser/browser/zen-workspaces.ftl
+++ b/locales/sv-SE/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Arbetsytor
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Ta bort arbetsyta
     .accesskey = D
diff --git a/locales/th/browser/browser/zen-folders.ftl b/locales/th/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/th/browser/browser/zen-folders.ftl
+++ b/locales/th/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/th/browser/browser/zen-general.ftl b/locales/th/browser/browser/zen-general.ftl
index 0771fd2c2..a974612ac 100644
--- a/locales/th/browser/browser/zen-general.ftl
+++ b/locales/th/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Learn More
 zen-close-label = Close
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/th/browser/browser/zen-workspaces.ftl b/locales/th/browser/browser/zen-workspaces.ftl
index 44221c35e..9674444b8 100644
--- a/locales/th/browser/browser/zen-workspaces.ftl
+++ b/locales/th/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Other Workspaces
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Delete Workspace
     .accesskey = D
diff --git a/locales/tr/browser/browser/zen-folders.ftl b/locales/tr/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/tr/browser/browser/zen-folders.ftl
+++ b/locales/tr/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/tr/browser/browser/zen-general.ftl b/locales/tr/browser/browser/zen-general.ftl
index 9a5089f53..0e6b8ab47 100644
--- a/locales/tr/browser/browser/zen-general.ftl
+++ b/locales/tr/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Daha Fazla Bilgi
 zen-close-label = Kapat
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/tr/browser/browser/zen-workspaces.ftl b/locales/tr/browser/browser/zen-workspaces.ftl
index 829cd0fe2..894da024f 100644
--- a/locales/tr/browser/browser/zen-workspaces.ftl
+++ b/locales/tr/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Diğer Çalışma Alanları
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Çalışma Alanını Sil
     .accesskey = D
diff --git a/locales/uk/browser/browser/zen-folders.ftl b/locales/uk/browser/browser/zen-folders.ftl
index f3ae8568a..904035e47 100644
--- a/locales/uk/browser/browser/zen-folders.ftl
+++ b/locales/uk/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Знайти { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/uk/browser/browser/zen-general.ftl b/locales/uk/browser/browser/zen-general.ftl
index 57a55860d..86bfe6c50 100644
--- a/locales/uk/browser/browser/zen-general.ftl
+++ b/locales/uk/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Дізнатися більше
 zen-close-label = Закрити
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Пошук...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/uk/browser/browser/zen-workspaces.ftl b/locales/uk/browser/browser/zen-workspaces.ftl
index cb3217e5e..89b2e1b84 100644
--- a/locales/uk/browser/browser/zen-workspaces.ftl
+++ b/locales/uk/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Простори
 zen-panel-ui-workspaces-create = 
     .label = Створити простір
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Видалити простір
     .accesskey = D
diff --git a/locales/vi/browser/browser/zen-folders.ftl b/locales/vi/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/vi/browser/browser/zen-folders.ftl
+++ b/locales/vi/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/vi/browser/browser/zen-general.ftl b/locales/vi/browser/browser/zen-general.ftl
index 34b2d274f..f5a48b9c8 100644
--- a/locales/vi/browser/browser/zen-general.ftl
+++ b/locales/vi/browser/browser/zen-general.ftl
@@ -44,3 +44,7 @@ zen-learn-more-text = Tìm hiểu thêm
 zen-close-label = Đóng
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Tìm kiếm...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/vi/browser/browser/zen-workspaces.ftl b/locales/vi/browser/browser/zen-workspaces.ftl
index 7927c4064..9e428197b 100644
--- a/locales/vi/browser/browser/zen-workspaces.ftl
+++ b/locales/vi/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = Không gian làm việc khác
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = Xóa không gian làm việc
     .accesskey = D
diff --git a/locales/zh-CN/browser/browser/zen-folders.ftl b/locales/zh-CN/browser/browser/zen-folders.ftl
index 2af21ff6b..220ce8de6 100644
--- a/locales/zh-CN/browser/browser/zen-folders.ftl
+++ b/locales/zh-CN/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = 搜索 { $folder-name }……
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/zh-CN/browser/browser/zen-general.ftl b/locales/zh-CN/browser/browser/zen-general.ftl
index fbb5531a0..a3380fcf3 100644
--- a/locales/zh-CN/browser/browser/zen-general.ftl
+++ b/locales/zh-CN/browser/browser/zen-general.ftl
@@ -42,3 +42,7 @@ zen-learn-more-text = 了解更多
 zen-close-label = 关闭
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = 搜索……
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/zh-CN/browser/browser/zen-workspaces.ftl b/locales/zh-CN/browser/browser/zen-workspaces.ftl
index e0cc61c1a..9eb1a0728 100644
--- a/locales/zh-CN/browser/browser/zen-workspaces.ftl
+++ b/locales/zh-CN/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = 工作区
 zen-panel-ui-workspaces-create = 
     .label = 创建工作区
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = 删除工作区
     .accesskey = D
diff --git a/locales/zh-TW/browser/browser/zen-folders.ftl b/locales/zh-TW/browser/browser/zen-folders.ftl
index db37b347a..46f93bca3 100644
--- a/locales/zh-TW/browser/browser/zen-folders.ftl
+++ b/locales/zh-TW/browser/browser/zen-folders.ftl
@@ -1,2 +1,15 @@
 zen-folders-search-placeholder = 
     .placeholder = Search { $folder-name }...
+zen-folders-panel-rename-folder = 
+    .label = Rename Folder
+zen-folders-panel-expand-folder = 
+    .label = Expand Folder
+zen-folders-panel-delete-folder = 
+    .label = Delete Folder
+zen-folders-panel-convert-folder-to-space = 
+    .label = Convert folder to Space
+zen-folders-panel-change-folder-space = 
+    .label = Change Space...
+zen-folders-panel-change-icon-folder = 
+    .label = Change Icon
+zen-folders-search-no-results = No tabs matching that search 🤔
diff --git a/locales/zh-TW/browser/browser/zen-general.ftl b/locales/zh-TW/browser/browser/zen-general.ftl
index 10122f71f..5b99b2d60 100644
--- a/locales/zh-TW/browser/browser/zen-general.ftl
+++ b/locales/zh-TW/browser/browser/zen-general.ftl
@@ -42,3 +42,7 @@ zen-learn-more-text = 瞭解更多
 zen-close-label = 關閉
 zen-singletoolbar-urlbar-placeholder-with-name = 
     .placeholder = Search...
+zen-icons-picker-emoji = 
+    .label = Emojis
+zen-icons-picker-svg = 
+    .label = Icons
diff --git a/locales/zh-TW/browser/browser/zen-workspaces.ftl b/locales/zh-TW/browser/browser/zen-workspaces.ftl
index cd0fc14de..e2f1a45a3 100644
--- a/locales/zh-TW/browser/browser/zen-workspaces.ftl
+++ b/locales/zh-TW/browser/browser/zen-workspaces.ftl
@@ -1,6 +1,8 @@
 zen-panel-ui-workspaces-text = 其他工作區
 zen-panel-ui-workspaces-create = 
     .label = Create Space
+zen-panel-ui-folder-create = 
+    .label = Create Folder
 zen-workspaces-panel-context-delete = 
     .label = 刪除工作區
     .accesskey = D