diff --git a/src/lib/components/DesktopEditor.svelte b/src/lib/components/DesktopEditor.svelte
index 9956d0fe..ea7b4868 100644
--- a/src/lib/components/DesktopEditor.svelte
+++ b/src/lib/components/DesktopEditor.svelte
@@ -22,7 +22,8 @@
       enabled: false
     },
     overviewRulerLanes: 0,
-    glyphMargin: true
+    glyphMargin: true,
+    lineNumbersMinChars: 4
   } satisfies monaco.editor.IStandaloneEditorConstructionOptions;
   let currentText = '';
   let showPopup = $state(false);
@@ -184,6 +185,7 @@
     const unsubscribeMode = mode.subscribe((mode) => {
       if (editor) {
         monaco.editor.setTheme(`mermaid${mode === 'dark' ? '-dark' : ''}`);
+        divElement?.classList.toggle('mermaid-dark', mode === 'dark');
       }
     });
     const resizeObserver = new ResizeObserver((entries) => {
@@ -239,4 +241,9 @@
     border-radius: 4px;
     cursor: pointer;
   }
+
+  :global(#editor.mermaid-dark .suggestion-icon) {
+    background-color: #2e4d6b;
+    background-image: url('/icons/use-chat-dark.svg');
+  }
 </style>
diff --git a/static/icons/use-chat-dark.svg b/static/icons/use-chat-dark.svg
new file mode 100644
index 00000000..b24e7143
--- /dev/null
+++ b/static/icons/use-chat-dark.svg
@@ -0,0 +1,9 @@
+<svg id="mySvg" width="64" height="64" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg"
+  aria-hidden="true" role="img">
+  <path class="p1"
+    d="M19 4C19 6.50909 19.8727 8.63636 21.6182 10.3818C23.3636 12.1273 25.4909 13 28 13C25.4909 13 23.3636 13.8727 21.6182 15.6182C19.8727 17.3636 19 19.4909 19 22C19 19.4909 18.1273 17.3636 16.3818 15.6182C14.6364 13.8727 12.5091 13 10 13C12.5091 13 14.6364 12.1273 16.3818 10.3818C18.1273 8.63636 19 6.50909 19 4Z"
+    fill="white" />
+  <path class="p2"
+    d="M8.5 16C8.5 17.2545 8.93636 18.3182 9.80909 19.1909C10.6818 20.0636 11.7455 20.5 13 20.5C11.7455 20.5 10.6818 20.9364 9.80909 21.8091C8.93636 22.6818 8.5 23.7455 8.5 25C8.5 23.7455 8.06364 22.6818 7.19091 21.8091C6.31818 20.9364 5.25455 20.5 4 20.5C5.25455 20.5 6.31818 20.0636 7.19091 19.1909C8.06364 18.3182 8.5 17.2545 8.5 16Z"
+    fill="white" />
+</svg>
\ No newline at end of file
diff --git a/static/icons/use-chat.svg b/static/icons/use-chat.svg
index 86ced9d4..5f4d7e45 100644
--- a/static/icons/use-chat.svg
+++ b/static/icons/use-chat.svg
@@ -2,8 +2,8 @@
   aria-hidden="true" role="img">
   <path class="p1"
     d="M19 4C19 6.50909 19.8727 8.63636 21.6182 10.3818C23.3636 12.1273 25.4909 13 28 13C25.4909 13 23.3636 13.8727 21.6182 15.6182C19.8727 17.3636 19 19.4909 19 22C19 19.4909 18.1273 17.3636 16.3818 15.6182C14.6364 13.8727 12.5091 13 10 13C12.5091 13 14.6364 12.1273 16.3818 10.3818C18.1273 8.63636 19 6.50909 19 4Z"
-    fill="currentColor" />
+    fill="black" />
   <path class="p2"
     d="M8.5 16C8.5 17.2545 8.93636 18.3182 9.80909 19.1909C10.6818 20.0636 11.7455 20.5 13 20.5C11.7455 20.5 10.6818 20.9364 9.80909 21.8091C8.93636 22.6818 8.5 23.7455 8.5 25C8.5 23.7455 8.06364 22.6818 7.19091 21.8091C6.31818 20.9364 5.25455 20.5 4 20.5C5.25455 20.5 6.31818 20.0636 7.19091 19.1909C8.06364 18.3182 8.5 17.2545 8.5 16Z"
-    fill="currentColor" />
+    fill="black" />
 </svg>
\ No newline at end of file