diff --git a/radio/src/thirdparty/libopenui/src/button.cpp b/radio/src/thirdparty/libopenui/src/button.cpp
index f2b9ad0e2..0ff6156e2 100644
--- a/radio/src/thirdparty/libopenui/src/button.cpp
+++ b/radio/src/thirdparty/libopenui/src/button.cpp
@@ -70,7 +70,7 @@ void Button::checkEvents()
 
 void TextButton::paint(BitmapBuffer * dc)
 {
-  auto textColor = COLOR_THEME_SECONDARY1;
+  auto textColor = getTextFlags();
   auto bgColor   = COLOR_THEME_SECONDARY2;
 
   if (bgColorHandler) {
@@ -79,6 +79,7 @@ void TextButton::paint(BitmapBuffer * dc)
     bgColor = COLOR_THEME_ACTIVE;
   } else if (hasFocus()) {
     bgColor = COLOR_THEME_FOCUS;
+    textColor = COLOR_THEME_PRIMARY2;
   }
 
   if (checked()) {
@@ -104,7 +105,7 @@ void TextButton::paint(BitmapBuffer * dc)
   }
 
   dc->drawText(rect.w / 2, 1 + (rect.h - getFontHeight(textFlags)) / 2,
-               text.c_str(), CENTERED | textFlags | textColor);
+               text.c_str(), CENTERED | textColor);
 }
 
 void IconButton::paint(BitmapBuffer * dc)
diff --git a/radio/src/thirdparty/libopenui/src/button.h b/radio/src/thirdparty/libopenui/src/button.h
index 78d09463b..07a8db3e1 100644
--- a/radio/src/thirdparty/libopenui/src/button.h
+++ b/radio/src/thirdparty/libopenui/src/button.h
@@ -96,6 +96,7 @@ class TextButton: public Button
        Button(parent, rect, std::move(pressHandler), windowFlags, textFlags),
        text(std::move(text))
    {
+     setTextFlags(textFlags | COLOR_THEME_PRIMARY1);
    }
 
 #if defined(DEBUG_WINDOWS)
diff --git a/radio/src/thirdparty/libopenui/src/menutoolbar.cpp b/radio/src/thirdparty/libopenui/src/menutoolbar.cpp
index 334098d52..1c5181c63 100644
--- a/radio/src/thirdparty/libopenui/src/menutoolbar.cpp
+++ b/radio/src/thirdparty/libopenui/src/menutoolbar.cpp
@@ -32,6 +32,6 @@ void MenuToolbarButton::paint(BitmapBuffer * dc)
                       &picto, 1, CENTERED | COLOR_THEME_PRIMARY2);
   } else {
     dc->drawSizedText(rect.w / 2, (rect.h - getFontHeight(FONT(STD))) / 2 + 1,
-                      &picto, 1, CENTERED | COLOR_THEME_SECONDARY1);
+                      &picto, 1, CENTERED | COLOR_THEME_PRIMARY1);
   }
 }
diff --git a/radio/src/thirdparty/libopenui/src/modal_window.cpp b/radio/src/thirdparty/libopenui/src/modal_window.cpp
index 2c1222890..8fba5c93f 100644
--- a/radio/src/thirdparty/libopenui/src/modal_window.cpp
+++ b/radio/src/thirdparty/libopenui/src/modal_window.cpp
@@ -41,7 +41,7 @@ void ModalWindow::deleteLater(bool detach, bool trash)
 
 void ModalWindow::paint(BitmapBuffer * dc)
 {
-  dc->drawFilledRect(0, 0, width(), height(), SOLID, COLOR_THEME_PRIMARY1, OPACITY(5));
+  dc->drawFilledRect(0, 0, width(), height(), SOLID, COLOR_THEME_SECONDARY3, OPACITY(5));
 }
 
 void ModalWindowContent::paint(BitmapBuffer * dc)