diff --git a/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts b/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
index 6c5cd1379a..f4a6dbd96a 100644
--- a/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
@@ -249,9 +249,6 @@ const toolbarTheme = EditorView.theme({
       },
     },
   },
-  '&.overall-theme-dark .ol-cm-toolbar-table-grid-popover': {
-    color: '#fff',
-  },
   '&.overall-theme-dark .ol-cm-toolbar-table-grid': {
     '& td.active': {
       outlineColor: 'white',
@@ -288,6 +285,7 @@ const toolbarTheme = EditorView.theme({
     borderRadius: '4px',
     backgroundColor: 'var(--editor-toolbar-bg)',
     pointerEvents: 'all',
+    color: 'var(--toolbar-btn-color)',
   },
   '.ol-cm-toolbar-button-menu-popover-unstyled': {
     maxWidth: 'unset',