diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/messages_fragment.xml
index 8480d62a5..2785553cf 100644
--- a/app/src/main/res/layout/messages_fragment.xml
+++ b/app/src/main/res/layout/messages_fragment.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorAdvancedBackground">
+    android:background="@color/colorAdvancedBackground"
+    >
 
     <com.google.android.material.appbar.MaterialToolbar
-
         android:id="@+id/toolbar"
         style="@style/MyToolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@color/colorPrimary"
+        android:background="@color/toolbarBackground"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="?android:attr/homeAsUpIndicator">
 
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index db6b97c7b..b00869f71 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,12 +1,17 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+
     <item
         android:id="@+id/connectStatusImage"
         android:contentDescription="@string/connection_status"
         android:icon="@drawable/cloud_off"
-        app:iconTint="@color/colorOnPrimary"
+        app:iconTint="@color/toolbarText"
         android:title="@string/disconnected"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"
+        />
+
     <item
         android:id="@+id/debug"
         android:title="@string/debug_panel"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index ea8a3511c..eda7b44c3 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorOnPrimary">#67EA94</color>
-    <color name="colorPrimary">#141414</color>
+    <color name="colorOnPrimary">#141414</color>
+    <color name="colorPrimary">#67EA94</color>
     <color name="colorPrimaryDark">#141414</color>
     <color name="colorMsg">#212121</color>
     <color name="colorMyMsg">#28463C</color>
@@ -11,4 +11,6 @@
     <color name="selectedColor">#67EA94</color>
     <color name="unselectedColor">#AAAAAA</color>
     <color name="colorAnnotation">#039BE5</color>
+    <color name="toolbarBackground">#141414</color>
+    <color name="toolbarText">#67EA94</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5a1a72b62..660a17442 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,4 +13,6 @@
     <color name="buttonColor">#67EA94</color>
     <color name="colourGrey">#535353</color>
     <color name="colorAnnotation">#0288D1</color>
+    <color name="toolbarBackground">#67EA94</color>
+    <color name="toolbarText">#FFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7cdb7b962..fbc800072 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -70,9 +70,8 @@
     </style>
 
     <style name="MyThemeOverlay_Toolbar" parent="">
-        <item name="background">@color/colorPrimary</item>
-        <item name="android:textColorPrimary">@color/colorOnPrimary</item>
-        <item name="tint">@color/colorOnPrimary</item>
+        <item name="android:textColorPrimary">@color/toolbarText</item>
+        <item name="tint">@color/toolbarText</item>
     </style>
 
     <style name="MyActionBar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar">