diff --git a/app/src/main/res/layout/widget_connection_status.xml b/app/src/main/res/layout/widget_connection_status.xml
index 40b2c94ea51960a505522dbcab926b60db6976d2..1414ff1e9d226e38b5895904eb23121e688cfacd 100644
--- a/app/src/main/res/layout/widget_connection_status.xml
+++ b/app/src/main/res/layout/widget_connection_status.xml
@@ -5,13 +5,14 @@
   android:id="@+id/connection_status"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?colorPrimaryDark"
+  android:background="?colorBackgroundSnackbar"
   android:minHeight="32dp"
   android:paddingLeft="16dp"
   android:paddingTop="6dp"
   android:paddingRight="16dp"
   android:paddingBottom="6dp"
   android:visibility="gone"
+  android:theme="?attr/actionBarTheme"
   tools:visibility="visible">
 
   <androidx.appcompat.widget.AppCompatImageView
@@ -19,7 +20,9 @@
     android:layout_width="20dp"
     android:layout_height="20dp"
     app:srcCompat="@drawable/ic_disconnected"
-    app:tint="?colorTextPrimaryInverse" />
+    android:visibility="gone"
+    app:tint="?android:textColorPrimary"
+    tools:visibility="visible" />
 
   <me.zhanghai.android.materialprogressbar.MaterialProgressBar
     android:id="@+id/connection_status_progress"
@@ -27,7 +30,8 @@
     android:layout_width="20dp"
     android:layout_height="20dp"
     android:indeterminate="true"
-    app:mpb_indeterminateTint="?colorTextPrimaryInverse" />
+    android:visibility="gone"
+    app:mpb_indeterminateTint="?android:textColorPrimary" />
 
   <TextView
     android:id="@+id/connection_status_text"
@@ -35,7 +39,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
     android:layout_marginLeft="16dp"
-    android:textColor="?colorTextPrimaryInverse"
+    android:textColor="?android:textColorPrimary"
     tools:text="@string/label_status_connecting" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 94405b9f6bdbab903a71db47ebfac3c705f4e5b0..5fbd71cddf6796c099cbe3a8fd34f1ac6b0ceecd 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -60,6 +60,7 @@
   <attr name="colorBackgroundSecondary" format="color" />
   <attr name="colorBackgroundCard" format="color" />
   <attr name="colorBackgroundDialog" format="color" />
+  <attr name="colorBackgroundSnackbar" format="color" />
 
   <attr name="colorMarkerLine" format="color" />
 
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index 4fce570ceadb25c02d0a72a6f6421733126c542f..9cf22b9da51ca37d1fa9dd933571524cc0f28c40 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -119,6 +119,8 @@
     <item name="android:textColor">?colorTextPrimary</item>
     <item name="android:textColorSecondary">?colorTextSecondary</item>
     <item name="colorControlNormal">?colorTextPrimary</item>
+
+    <item name="colorBackgroundSnackbar">?colorPrimaryDark</item>
   </style>
 
   <style name="Theme.ChatTheme.Light" parent="Base.ChatTheme.Light">
@@ -159,9 +161,11 @@
     <item name="android:textColorPrimary">?colorTextPrimary</item>
     <item name="android:textColorSecondary">?colorTextSecondary</item>
     <item name="colorControlNormal">?colorTextPrimary</item>
+
+    <item name="colorBackgroundSnackbar">?colorPrimary</item>
   </style>
 
-  <style name="Theme.ChatTheme.Light.DarkHead" parent="Theme.ChatTheme.Light.Auto">
+  <style name="Theme.ChatTheme.Light.DarkHead" parent="Theme.ChatTheme.Light">
     <item name="actionBarTheme">@style/Widget.AppBarOverlay.Light.DarkHead</item>
     <item name="formatBarTheme">@style/Widget.AppBarOverlay.Light.Auto</item>
     <item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light.Auto</item>
@@ -171,6 +175,8 @@
     <item name="android:textColorPrimary">?colorTextPrimary</item>
     <item name="android:textColorSecondary">?colorTextSecondary</item>
     <item name="colorControlNormal">?colorTextPrimary</item>
+
+    <item name="colorBackgroundSnackbar">?colorPrimaryDark</item>
   </style>
 
   <style name="Widget.PopupOverlay.Setup" parent="Widget.AppBarOverlay.Light">
diff --git a/app/src/main/res/values/themes_dracula.xml b/app/src/main/res/values/themes_dracula.xml
index f1f26e2d014cd4c78cddebb08675c095a5142986..cbed35825eb8fbb375b5d987c770eb56ae1fbf99 100644
--- a/app/src/main/res/values/themes_dracula.xml
+++ b/app/src/main/res/values/themes_dracula.xml
@@ -66,6 +66,7 @@
     <item name="colorBackgroundSecondary">#44475a</item>
     <item name="colorBackgroundCard">#44475a</item>
     <item name="colorBackgroundDialog">#282a36</item>
+    <item name="colorBackgroundSnackbar">#373949</item>
 
     <item name="colorOffline">#586e75</item>
     <item name="colorAway">#586e75</item>
diff --git a/app/src/main/res/values/themes_solarized.xml b/app/src/main/res/values/themes_solarized.xml
index 1d2a5ec0f870bd56902d2a47ec81075bbbbb383c..d3582f40ce24c47c756fc8659c2bdd81efaf6432 100644
--- a/app/src/main/res/values/themes_solarized.xml
+++ b/app/src/main/res/values/themes_solarized.xml
@@ -127,6 +127,7 @@
     <item name="colorBackgroundSecondary">#073642</item>
     <item name="colorBackgroundCard">#073642</item>
     <item name="colorBackgroundDialog">#002B36</item>
+    <item name="colorBackgroundSnackbar">#04313c</item>
 
     <item name="colorOffline">#839496</item>
     <item name="colorAway">#839496</item>