diff --git a/_regroup/.github/actions/build-electron/action.yml b/_regroup/.github/actions/build-electron/action.yml
index 2fd8d1a7d..b1bbbb79e 100644
--- a/_regroup/.github/actions/build-electron/action.yml
+++ b/_regroup/.github/actions/build-electron/action.yml
@@ -21,7 +21,7 @@ runs:
     # Certificate setup
     - name: Import Apple certificates
       if: inputs.os == 'macos'
-      uses: apple-actions/import-codesign-certs@v3
+      uses: apple-actions/import-codesign-certs@v5
       with:
         p12-file-base64: ${{ env.APPLE_APP_CERTIFICATE_BASE64 }}
         p12-password: ${{ env.APPLE_APP_CERTIFICATE_PASSWORD }}
@@ -30,7 +30,7 @@ runs:
 
     - name: Install Installer certificate
       if: inputs.os == 'macos'
-      uses: apple-actions/import-codesign-certs@v3
+      uses: apple-actions/import-codesign-certs@v5
       with:
         p12-file-base64: ${{ env.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
         p12-password: ${{ env.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}
diff --git a/apps/client/stylesheets/theme-next-dark.css b/apps/client/stylesheets/theme-next-dark.css
index 2dbeb525c..98f379c6e 100644
--- a/apps/client/stylesheets/theme-next-dark.css
+++ b/apps/client/stylesheets/theme-next-dark.css
@@ -232,6 +232,8 @@
     --help-kbd-shortcut-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
     --help-code-color: inherit;
     --help-code-background: #565656;
+
+    --ck-editor-popup-border-color: var(--modal-border-color);
 }
 
 /*
diff --git a/apps/client/stylesheets/theme-next-light.css b/apps/client/stylesheets/theme-next-light.css
index 46c116e39..7793d8ece 100644
--- a/apps/client/stylesheets/theme-next-light.css
+++ b/apps/client/stylesheets/theme-next-light.css
@@ -232,4 +232,6 @@
     --help-kbd-shortcut-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
     --help-code-color: black;
     --help-code-background: #d7d5d5;
+
+    --ck-editor-popup-border-color: var(--dropdown-border-color);
 }
diff --git a/apps/client/stylesheets/theme-next/notes/text.css b/apps/client/stylesheets/theme-next/notes/text.css
index 8dd09c485..64c55e6b0 100644
--- a/apps/client/stylesheets/theme-next/notes/text.css
+++ b/apps/client/stylesheets/theme-next/notes/text.css
@@ -36,14 +36,15 @@
 :root .ck.ck-dropdown__panel,
 :root .ck-balloon-panel {
     --ck-color-panel-background: var(--menu-background-color);
-    --ck-color-panel-border: var(--modal-border-color);
+    --ck-color-panel-border: var(--ck-editor-popup-border-color);
 
     box-shadow: 0px 10px 20px rgba(0, 0, 0, var(--dropdown-shadow-opacity));
-    border: 1px solid var(--modal-border-color) !important;
+    outline: transparent !important;
+    border: 1px solid var(--ck-editor-popup-border-color) !important;
     border-radius: var(--dropdown-border-radius) !important;
     background: var(--menu-background-color) !important;
     backdrop-filter: var(--dropdown-backdrop-filter);
-    padding: var(--menu-padding-size);    
+    padding: 4px;
 }
 
 :root ul.ck.ck-list,
@@ -52,6 +53,19 @@
     background: transparent;
 }
 
+/* Tooltip */
+:root div.ck.ck-balloon-panel.ck-tooltip {
+    --ck-color-panel-background: var(--toast-background); /* Arrow */
+    border-color: transparent !important;
+    border-radius: 6px !important;
+    padding: 0 10px 2px 10px;
+    background-color: var(--toast-background) !important;
+}
+
+:root div.ck.ck-balloon-panel.ck-tooltip * {
+    color: var(--toast-text-color) !important;
+}
+
 /* Dropdown list item */
 :root ul.ck.ck-list button.ck-button {
     padding: 2px 16px;
diff --git a/package.json b/package.json
index ca1ae6926..211311434 100644
--- a/package.json
+++ b/package.json
@@ -12,4 +12,4 @@
         "apps/*",
         "packages/*"
     ]
-}
\ No newline at end of file
+}