diff --git a/common/dialogs/wx_html_report_panel.cpp b/common/dialogs/wx_html_report_panel.cpp
index 2857d20ce0..a01154db6f 100644
--- a/common/dialogs/wx_html_report_panel.cpp
+++ b/common/dialogs/wx_html_report_panel.cpp
@@ -33,6 +33,7 @@
 #include <wx/msgdlg.h>
 #include <wx/menu.h>
 #include <wx/textctrl.h>
+#include <kiplatform/ui.h>
 
 WX_HTML_REPORT_PANEL::WX_HTML_REPORT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos,
                                             const wxSize& size, long style ) :
@@ -181,23 +182,47 @@ wxString WX_HTML_REPORT_PANEL::generateHtml( const REPORT_LINE& aLine )
     if( !( m_severities & aLine.severity ) )
         return retv;
 
-    switch( aLine.severity )
+    if( KIPLATFORM::UI::IsDarkTheme() )
     {
-    case RPT_SEVERITY_ERROR:
-        retv = "<font color=\"red\" size=3>" + _( "Error:" ) + " </font>"
-               "<font size=3>" + aLine.message + "</font><br>";
-        break;
-    case RPT_SEVERITY_WARNING:
-        retv = "<font size=3>" + _( "Warning:" ) + wxS( " " ) + aLine.message + "</font><br>";
-        break;
-    case RPT_SEVERITY_INFO:
-        retv = "<font color=\"dark gray\" size=3>" + aLine.message + "</font><br>";
-        break;
-    case RPT_SEVERITY_ACTION:
-        retv = "<font color=\"dark green\" size=3>" + aLine.message + "</font><br>";
-        break;
-    default:
-        retv = "<font size=3>" + aLine.message + "</font><br>";
+        switch( aLine.severity )
+        {
+        case RPT_SEVERITY_ERROR:
+            retv = "<font color=#F04040 size=3>" + _( "Error:" ) + " </font>"
+                   "<font size=3>" + aLine.message + "</font><br>";
+            break;
+        case RPT_SEVERITY_WARNING:
+            retv = "<font size=3>" + _( "Warning:" ) + wxS( " " ) + aLine.message + "</font><br>";
+            break;
+        case RPT_SEVERITY_INFO:
+            retv = "<font color=#909090 size=3>" + aLine.message + "</font><br>";
+            break;
+        case RPT_SEVERITY_ACTION:
+            retv = "<font color=#60D060 size=3>" + aLine.message + "</font><br>";
+            break;
+        default:
+            retv = "<font size=3>" + aLine.message + "</font><br>";
+        }
+    }
+    else
+    {
+        switch( aLine.severity )
+        {
+        case RPT_SEVERITY_ERROR:
+            retv = "<font color=#D00000 size=3>" + _( "Error:" ) + " </font>"
+                   "<font size=3>" + aLine.message + "</font><br>";
+            break;
+        case RPT_SEVERITY_WARNING:
+            retv = "<font size=3>" + _( "Warning:" ) + wxS( " " ) + aLine.message + "</font><br>";
+            break;
+        case RPT_SEVERITY_INFO:
+            retv = "<font color=#808080 size=3>" + aLine.message + "</font><br>";
+            break;
+        case RPT_SEVERITY_ACTION:
+            retv = "<font color=#008000 size=3>" + aLine.message + "</font><br>";
+            break;
+        default:
+            retv = "<font size=3>" + aLine.message + "</font><br>";
+        }
     }
 
     return retv;
diff --git a/common/widgets/number_badge.cpp b/common/widgets/number_badge.cpp
index 447f8011e9..d168e532cb 100644
--- a/common/widgets/number_badge.cpp
+++ b/common/widgets/number_badge.cpp
@@ -25,7 +25,7 @@
 #include <widgets/number_badge.h>
 
 #include <algorithm>
-
+#include <kiplatform/ui.h>
 
 NUMBER_BADGE::NUMBER_BADGE( wxWindow* aParent, wxWindowID aId, const wxPoint& aPos,
                             const wxSize& aSize, int aStyles ) :
@@ -67,7 +67,7 @@ void NUMBER_BADGE::UpdateNumber( int aNumber, SEVERITY aSeverity )
         switch( aSeverity )
         {
         case RPT_SEVERITY_ERROR:
-            m_badgeColour = *wxRED;
+            m_badgeColour = KIPLATFORM::UI::IsDarkTheme() ? wxColour( 240, 64, 64 ) : *wxRED;
             m_textColour  = *wxWHITE;
             break;