diff --git a/gajim/data/style/default-dark.css b/gajim/data/style/default-dark.css
index 806dbc142..60eaf2c5c 100644
--- a/gajim/data/style/default-dark.css
+++ b/gajim/data/style/default-dark.css
@@ -1,11 +1,11 @@
 .gajim-incoming-nickname {
-    color: rgb(164, 0, 0)
+    color: rgb(207, 49, 47)
     }
 .gajim-outgoing-nickname {
-    color: rgb(52, 101, 164)
+    color: rgb(38, 139, 210)
     }
 .gajim-url {
-    color: rgb(117, 80, 123)
+    color: rgb(53, 132, 228)
     }
 .gajim-highlight-message {
     color: rgb(245, 121, 0)
@@ -27,4 +27,4 @@
     }
 .gajim-state-paused {
     color: rgb(0, 0, 205)
-    }
\ No newline at end of file
+    }
diff --git a/gajim/gtk/history.py b/gajim/gtk/history.py
index d2223befa..6e457c564 100644
--- a/gajim/gtk/history.py
+++ b/gajim/gtk/history.py
@@ -36,6 +36,7 @@ from gajim.common import exceptions
 from gajim.common.i18n import _
 from gajim.common.const import ShowConstant
 from gajim.common.const import KindConstant
+from gajim.common.const import StyleAttr
 
 from gajim import conversation_textview
 
@@ -85,7 +86,9 @@ class HistoryWindow(Gtk.ApplicationWindow):
             account, used_in_history_window=True)
         self._ui.scrolledwindow.add(self.history_textview.tv)
         self.history_buffer = self.history_textview.tv.get_buffer()
-        self.history_buffer.create_tag('highlight', background='yellow')
+        highlight_color = app.css_config.get_value(
+            '.gajim-highlight-message', StyleAttr.COLOR)
+        self.history_buffer.create_tag('highlight', background=highlight_color)
         self.history_buffer.create_tag('invisible', invisible=True)
 
         self.clearing_search = False