diff --git a/apps/client/src/widgets/type_widgets/file/PdfViewer.tsx b/apps/client/src/widgets/type_widgets/file/PdfViewer.tsx
index 3d39135c19..c56f00d03f 100644
--- a/apps/client/src/widgets/type_widgets/file/PdfViewer.tsx
+++ b/apps/client/src/widgets/type_widgets/file/PdfViewer.tsx
@@ -30,7 +30,9 @@ const VARIABLE_WHITELIST = new Set([
     "menu-item-icon-color",
     "input-focus-outline-color",
     "input-background-color",
-    "input-text-color"
+    "input-text-color",
+    "ck-editor-toolbar-button-on-background",
+    "ck-editor-toolbar-button-on-color",
 ]);
 
 interface PdfViewerProps extends Pick<HTMLAttributes<HTMLIFrameElement>, "tabIndex"> {
diff --git a/packages/pdfjs-viewer/src/custom.css b/packages/pdfjs-viewer/src/custom.css
index 606afa4ac7..0f74f03716 100644
--- a/packages/pdfjs-viewer/src/custom.css
+++ b/packages/pdfjs-viewer/src/custom.css
@@ -33,7 +33,8 @@
 #documentPropertiesDialog,
 #findbar.doorHanger,
 .doorHangerRight,
-#printServiceDialog {
+#printServiceDialog,
+:root :is(.annotationEditorLayer :is(.freeTextEditor, .inkEditor, .stampEditor, .highlightEditor, .signatureEditor), .textLayer) .editToolbar {
     border: 1px solid var(--tn-dropdown-border-color);
     border-radius: var(--tn-dropdown-border-radius);
     background-color: var(--tn-menu-background-color);
@@ -85,7 +86,24 @@
     }
 }
 
-#findbar {
+:root #findbar {
+    --toolbar-height: 40px;
+    padding: 0 4px;
+
+    .toggleButton.toolbarLabel,
+    .toolbarButton {
+        height: calc(var(--toolbar-height) - 12px);
+        padding-inline: 10px;
+        border-radius: 6px;
+        aspect-ratio: unset;
+    }
+
+    .toggleButton.toolbarLabel {
+        --main-color: var(--tn-ck-color-text);
+        --button-hover-color: var(--tn-hover-item-background-color);
+        --toggled-btn-bg-color: var(--tn-ck-editor-toolbar-button-on-background);
+        --toggled-btn-color: var(--tn-ck-editor-toolbar-button-on-color);
+    }
 }
 
 #scaleSelectContainer {