diff --git a/ivette/src/colors/dark-code.css b/ivette/src/colors/dark-code.css
index d7ca1b433cc14c4bc6d8135942914836b0f687f0..660ee1a0e5cd3f76a4b97be05c2400036ae7d15b 100644
--- a/ivette/src/colors/dark-code.css
+++ b/ivette/src/colors/dark-code.css
@@ -26,7 +26,7 @@
 
 
 .cm-s-dark-code div.CodeMirror-selected {
-  background: var(--info-text-discrete);
+  background: #3e4b5d;
 }
 
 .cm-s-dark-code span.cm-meta { color: #83a598; }
diff --git a/ivette/src/colors/dark.css b/ivette/src/colors/dark.css
index e44bd72f7177191f6a65590b164f85abddb8fb8f..28993e4bdf663730013a90a2a395f0f43ccbbf3e 100644
--- a/ivette/src/colors/dark.css
+++ b/ivette/src/colors/dark.css
@@ -5,6 +5,7 @@
     --disabled-text: #506679;
     --info-text: #748a8d;
     --info-text-discrete: #778d94;
+    --text-highlighted: #d4eaed;
 
     --code-hover: #005137;
     --code-select: #4f3d24;
@@ -29,8 +30,8 @@
     --background-button-hover: #c0c0c0;
     --background-alterning-odd: #354154;
     --background-alterning-even: #475366;
-    --selected-element: #082032;
-    --background-interaction: #5c697b;
+    --selected-element: #68758e;
+    --background-interaction: #4c596b;
 
     --lcd-button-color: #21211a;
     --lcd-button-background: #727798;
diff --git a/ivette/src/colors/light.css b/ivette/src/colors/light.css
index 081cc5c31e84ecc1bf84a4aa78cc4098930f0ae6..a422d1e4b4e9cc97f31da14b0ffda49da67d1c86 100644
--- a/ivette/src/colors/light.css
+++ b/ivette/src/colors/light.css
@@ -5,6 +5,7 @@
     --disabled-text: #b0b0b0;
     --info-text: #777;
     --info-text-discrete: #888;
+    --text-highlighted: blue;
 
     --code-hover: lightgreen;
     --code-select: #ffda95;
diff --git a/ivette/src/dome/renderer/controls/style.css b/ivette/src/dome/renderer/controls/style.css
index 552662f462827460b3debd875a8cd45de0538e07..a6eb5276d728561d9c28688d4e38517cf0255b6c 100644
--- a/ivette/src/dome/renderer/controls/style.css
+++ b/ivette/src/dome/renderer/controls/style.css
@@ -265,7 +265,6 @@
 .dome-xButton-led {
     display: inline ;
     position: relative ;
-    bottom: -2px ;
     border-color: var(--border) ;
     border-style: solid ;
     border-width: 1px ;
diff --git a/ivette/src/dome/renderer/frame/style.css b/ivette/src/dome/renderer/frame/style.css
index ac5839b3291f47cce1085ea9036d35199fbdfa4d..d610e3bd003db02acbdc919c1dd7603a560a3ead 100644
--- a/ivette/src/dome/renderer/frame/style.css
+++ b/ivette/src/dome/renderer/frame/style.css
@@ -356,8 +356,8 @@
 .dome-xToolBar-control:disabled {
     fill: var(--disabled-text) ;
     color: var(--disabled-text) ;
+    border-color: var(--background-intense) ;
     box-shadow: none ;
-    border-color: var(--border-discrete) ;
 }
 
 /* Selected */
@@ -396,28 +396,33 @@
 
 .dome-xToolBar-group .dome-xToolBar-control {
     margin: 0 ;
-}
-
-.dome-xToolBar-group .dome-xToolBar-control:not(:first-child) {
-    border-left: 0 ;
+    border-radius: 0;
 }
 
 .dome-xToolBar-group > .dome-xToolBar-control:first-child {
-    border-top-right-radius: 0 ;
-    border-bottom-right-radius: 0 ;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
 }
 
 .dome-xToolBar-group > .dome-xToolBar-control:last-child {
-    border-top-left-radius: 0 ;
-    border-bottom-left-radius: 0 ;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
 }
 
-.dome-xToolBar-group > .dome-xToolBar-control:first-child:last-child {
-    border-radius: 4px ;
+.dome-xToolBar-group .dome-xToolBar-control:not(:first-child) {
+    border-left: 0 ;
+}
+
+.dome-xToolBar-group .dome-xToolBar-control:not(:last-child) {
+    border-right: 0 ;
 }
 
-.dome-xToolBar-group > .dome-xToolBar-control:not(:first-child):not(:last-child) {
-    border-radius: 0 ;
+.dome-xToolBar-group .dome-xToolBar-control:not(:disabled):not(:last-child) {
+  border-right: 1px solid var(--border);
+}
+
+.dome-xToolBar-control:disabled + .dome-xToolBar-control:not(:disabled) {
+  border-left: 1px solid var(--border);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -466,6 +471,7 @@
 }
 
 .dome-xToolBar-searchitem {
+    color: var(--text);
     display: block ;
     width: 100% ;
     margin-left: 0px ;
diff --git a/ivette/src/frama-c/kernel/ASTinfo.tsx b/ivette/src/frama-c/kernel/ASTinfo.tsx
index c62298d5c5608487160420f8a5e54378e0a94c89..42d5488bfbc0e86951ea86494094c2aa74aa6360 100644
--- a/ivette/src/frama-c/kernel/ASTinfo.tsx
+++ b/ivette/src/frama-c/kernel/ASTinfo.tsx
@@ -47,9 +47,8 @@ export default function ASTinfo(): JSX.Element {
 
   React.useEffect(() => {
     buffer.clear();
-    if (data) {
-      Utils.printTextWithTags(buffer, data, { css: 'color: blue' });
-    }
+    const style = { css: 'color: var(--text-highlighted)' };
+    if (data) Utils.printTextWithTags(buffer, data, style);
   }, [buffer, data]);
 
   // Callbacks
diff --git a/ivette/src/renderer/style.css b/ivette/src/renderer/style.css
index fdadd655852e3e5a4b7d5758e632ff5841ed0e83..d8cb5ddb76b9048cdef0cf3b77fdaa624d8c07f1 100644
--- a/ivette/src/renderer/style.css
+++ b/ivette/src/renderer/style.css
@@ -95,6 +95,11 @@
 /* --- Styling all inputs                                                 --- */
 /* -------------------------------------------------------------------------- */
 
+input[type="search"]::placeholder {
+  font-style: italic;
+  color: var(--text-discrete);
+}
+
 input[type="text"]::placeholder {
   font-style: italic;
   color: var(--text-discrete);