diff --git a/src/components/Themes.css b/src/components/Themes.css
index 02ca143..533d08c 100644
--- a/src/components/Themes.css
+++ b/src/components/Themes.css
@@ -37,7 +37,7 @@
     --layer-color-non-transparent: #ddd;
     --layer-color-non-transparent-hover: #ccc;
     --layer-color-non-transparent-disabled: #888;
-    --text-color-disabled: #888;
+    --text-color-disabled: #666;
     --border-color: #888;
     --text-color-inverted: #eee;
     --icon-color: #222;
diff --git a/src/components/map/Map.css b/src/components/map/Map.css
index 1e94315..f442a23 100644
--- a/src/components/map/Map.css
+++ b/src/components/map/Map.css
@@ -24,6 +24,10 @@
     text-shadow: 0 0 16px var(--map-shadow-color);
 }
 
+.map .sign-text {
+    text-shadow: none;
+}
+
 .map .switch-name-text {
     font-size: 3px;
 }
diff --git a/src/components/map/object-renderers/SignRenderer.js b/src/components/map/object-renderers/SignRenderer.js
index a9a473b..0882d2d 100644
--- a/src/components/map/object-renderers/SignRenderer.js
+++ b/src/components/map/object-renderers/SignRenderer.js
@@ -40,7 +40,7 @@ function SignTextRenderer(props) {
 
     return (
         <text
-            className="sign-data-text"
+            className="sign-text"
             transform={`translate(${x}, ${y})`}
             style={{ fontSize: `${object.def.textSize}mm` }}
             textAnchor="middle"
diff --git a/src/components/map/object-renderers/SignalExtendedRenderer.js b/src/components/map/object-renderers/SignalExtendedRenderer.js
index b073b87..c9ad463 100644
--- a/src/components/map/object-renderers/SignalExtendedRenderer.js
+++ b/src/components/map/object-renderers/SignalExtendedRenderer.js
@@ -262,7 +262,7 @@ function SignalSignText(id, text, y) {
 
     return <text
         key={`${id}-text`}
-        className="signal-sign-text"
+        className="sign-text"
         transform={`translate(${def.textOffsetX || 0}, ${y + (def.textOffsetY || 0)})`}
         style={{ fontSize: `${def.textSize || C.SIGN_DEFAULT_FONT_SIZE}mm` }}
         textAnchor="middle"
diff --git a/src/components/map/track-hover-info/TrackHoverInfo.css b/src/components/map/track-hover-info/TrackHoverInfo.css
index 9b9c979..b930e31 100644
--- a/src/components/map/track-hover-info/TrackHoverInfo.css
+++ b/src/components/map/track-hover-info/TrackHoverInfo.css
@@ -6,7 +6,7 @@
 }
 
 .track-hover-info-popup {
-    background-color: var(--layer-color-non-transparent);
+    background-color: var(--background-color);
     border: 2px solid var(--border-color);
     border-radius: 8px;
     padding: 1em;
diff --git a/src/components/sidemenu/SideMenu.css b/src/components/sidemenu/SideMenu.css
index feac37b..446b8a0 100644
--- a/src/components/sidemenu/SideMenu.css
+++ b/src/components/sidemenu/SideMenu.css
@@ -10,7 +10,7 @@
     top: 0;
     bottom: 0;
     background-color: var(--background-color);
-    z-index: 2000;
+    z-index: 50;
     width: max-content;
     transition: transform 0.2s ease-in-out;
     display: flex;
diff --git a/src/components/toolbar/Toolbar.css b/src/components/toolbar/Toolbar.css
index 3442268..487c9e0 100644
--- a/src/components/toolbar/Toolbar.css
+++ b/src/components/toolbar/Toolbar.css
@@ -33,7 +33,7 @@
     text-align: center;
     opacity: 0;
     transition: opacity 1s ease-in-out;
-    z-index: 1000;
+    z-index: 49;
     position: relative;
 }