diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 38b261c37..38a78df68 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -657,12 +657,12 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         final BubbleColor bubbleColor;
         if (type == RECEIVED) {
             if (isInValidSession) {
-                bubbleColor = colorfulBackground ? BubbleColor.TERTIARY : BubbleColor.SURFACE;
+                bubbleColor = colorfulBackground ? BubbleColor.SECONDARY : BubbleColor.SURFACE;
             } else {
                 bubbleColor = BubbleColor.WARNING;
             }
         } else {
-            bubbleColor = colorfulBackground ? BubbleColor.SECONDARY : BubbleColor.SURFACE;
+            bubbleColor = colorfulBackground ? BubbleColor.TERTIARY : BubbleColor.SURFACE;
         }
 
         if (type == DATE_SEPARATOR) {
@@ -701,9 +701,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 }
             }
             if (colorfulBackground) {
-                setBackgroundTint(viewHolder.message_box,BubbleColor.TERTIARY);
-                setTextColor(viewHolder.status_message, BubbleColor.TERTIARY);
-                setImageTint(viewHolder.indicatorReceived, BubbleColor.TERTIARY);
+                setBackgroundTint(viewHolder.message_box,BubbleColor.SECONDARY);
+                setTextColor(viewHolder.status_message, BubbleColor.SECONDARY);
+                setImageTint(viewHolder.indicatorReceived, BubbleColor.SECONDARY);
             } else {
                 setBackgroundTint(viewHolder.message_box,BubbleColor.SURFACE);
                 setTextColor(viewHolder.status_message, BubbleColor.SURFACE);
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index f12ec5911..7cd36dbdc 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -62,7 +62,7 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/textSendButton"
                 android:background="@drawable/background_message_bubble"
-                android:backgroundTint="?colorSecondaryContainer"
+                android:backgroundTint="?colorTertiaryContainer"
                 android:orientation="vertical"
                 android:paddingHorizontal="16dp"
                 android:paddingVertical="8dp">
@@ -74,7 +74,7 @@
                     android:layout_marginBottom="8sp"
                     android:maxLines="1"
                     android:textAppearance="?textAppearanceBodySmall"
-                    android:textColor="?colorOnSecondaryContainer"
+                    android:textColor="?colorOnTertiaryContainer"
                     android:visibility="visible"
                     tools:text="@string/private_message_to" />
 
diff --git a/src/quicksy/res/values/colors-themed.xml b/src/quicksy/res/values/colors-themed.xml
index 60c985a6f..ad7f95c5c 100644
--- a/src/quicksy/res/values/colors-themed.xml
+++ b/src/quicksy/res/values/colors-themed.xml
@@ -1,64 +1,64 @@
 
 <resources>
-    <color name="seed">#004D40</color>
-    <color name="md_theme_light_primary">#006B5A</color>
+    <color name="seed">#00796B</color>
+    <color name="md_theme_light_primary">#006B5E</color>
     <color name="md_theme_light_onPrimary">#FFFFFF</color>
-    <color name="md_theme_light_primaryContainer">#7AF8DB</color>
-    <color name="md_theme_light_onPrimaryContainer">#00201A</color>
-    <color name="md_theme_light_secondary">#4B635C</color>
+    <color name="md_theme_light_primaryContainer">#76F8E2</color>
+    <color name="md_theme_light_onPrimaryContainer">#00201B</color>
+    <color name="md_theme_light_secondary">#4A635E</color>
     <color name="md_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_theme_light_secondaryContainer">#CDE8DF</color>
-    <color name="md_theme_light_onSecondaryContainer">#06201A</color>
-    <color name="md_theme_light_tertiary">#984718</color>
+    <color name="md_theme_light_secondaryContainer">#CDE8E1</color>
+    <color name="md_theme_light_onSecondaryContainer">#06201B</color>
+    <color name="md_theme_light_tertiary">#446179</color>
     <color name="md_theme_light_onTertiary">#FFFFFF</color>
-    <color name="md_theme_light_tertiaryContainer">#FFDBCC</color>
-    <color name="md_theme_light_onTertiaryContainer">#351000</color>
+    <color name="md_theme_light_tertiaryContainer">#CAE6FF</color>
+    <color name="md_theme_light_onTertiaryContainer">#001E30</color>
     <color name="md_theme_light_error">#BA1A1A</color>
     <color name="md_theme_light_errorContainer">#FFDAD6</color>
     <color name="md_theme_light_onError">#FFFFFF</color>
     <color name="md_theme_light_onErrorContainer">#410002</color>
-    <color name="md_theme_light_background">#FAFDFA</color>
+    <color name="md_theme_light_background">#FAFDFB</color>
     <color name="md_theme_light_onBackground">#191C1B</color>
-    <color name="md_theme_light_surface">#FAFDFA</color>
+    <color name="md_theme_light_surface">#FAFDFB</color>
     <color name="md_theme_light_onSurface">#191C1B</color>
-    <color name="md_theme_light_surfaceVariant">#DBE5E0</color>
-    <color name="md_theme_light_onSurfaceVariant">#3F4945</color>
-    <color name="md_theme_light_outline">#6F7975</color>
+    <color name="md_theme_light_surfaceVariant">#DAE5E1</color>
+    <color name="md_theme_light_onSurfaceVariant">#3F4946</color>
+    <color name="md_theme_light_outline">#6F7976</color>
     <color name="md_theme_light_inverseOnSurface">#EFF1EF</color>
-    <color name="md_theme_light_inverseSurface">#2E3130</color>
-    <color name="md_theme_light_inversePrimary">#5BDBBF</color>
+    <color name="md_theme_light_inverseSurface">#2D3130</color>
+    <color name="md_theme_light_inversePrimary">#55DBC6</color>
     <color name="md_theme_light_shadow">#000000</color>
-    <color name="md_theme_light_surfaceTint">#006B5A</color>
-    <color name="md_theme_light_outlineVariant">#BFC9C4</color>
+    <color name="md_theme_light_surfaceTint">#006B5E</color>
+    <color name="md_theme_light_outlineVariant">#BEC9C5</color>
     <color name="md_theme_light_scrim">#000000</color>
-    <color name="md_theme_dark_primary">#5BDBBF</color>
-    <color name="md_theme_dark_onPrimary">#00382E</color>
-    <color name="md_theme_dark_primaryContainer">#005143</color>
-    <color name="md_theme_dark_onPrimaryContainer">#7AF8DB</color>
-    <color name="md_theme_dark_secondary">#B1CCC3</color>
-    <color name="md_theme_dark_onSecondary">#1D352F</color>
-    <color name="md_theme_dark_secondaryContainer">#334B45</color>
-    <color name="md_theme_dark_onSecondaryContainer">#CDE8DF</color>
-    <color name="md_theme_dark_tertiary">#FFB693</color>
-    <color name="md_theme_dark_onTertiary">#562000</color>
-    <color name="md_theme_dark_tertiaryContainer">#7A3001</color>
-    <color name="md_theme_dark_onTertiaryContainer">#FFDBCC</color>
+    <color name="md_theme_dark_primary">#55DBC6</color>
+    <color name="md_theme_dark_onPrimary">#003730</color>
+    <color name="md_theme_dark_primaryContainer">#005047</color>
+    <color name="md_theme_dark_onPrimaryContainer">#76F8E2</color>
+    <color name="md_theme_dark_secondary">#B1CCC5</color>
+    <color name="md_theme_dark_onSecondary">#1C3530</color>
+    <color name="md_theme_dark_secondaryContainer">#334B46</color>
+    <color name="md_theme_dark_onSecondaryContainer">#CDE8E1</color>
+    <color name="md_theme_dark_tertiary">#ACCAE5</color>
+    <color name="md_theme_dark_onTertiary">#133348</color>
+    <color name="md_theme_dark_tertiaryContainer">#2C4A60</color>
+    <color name="md_theme_dark_onTertiaryContainer">#CAE6FF</color>
     <color name="md_theme_dark_error">#FFB4AB</color>
     <color name="md_theme_dark_errorContainer">#93000A</color>
     <color name="md_theme_dark_onError">#690005</color>
     <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
     <color name="md_theme_dark_background">#191C1B</color>
-    <color name="md_theme_dark_onBackground">#E1E3E0</color>
+    <color name="md_theme_dark_onBackground">#E0E3E1</color>
     <color name="md_theme_dark_surface">#191C1B</color>
-    <color name="md_theme_dark_onSurface">#E1E3E0</color>
-    <color name="md_theme_dark_surfaceVariant">#3F4945</color>
-    <color name="md_theme_dark_onSurfaceVariant">#BFC9C4</color>
-    <color name="md_theme_dark_outline">#89938F</color>
+    <color name="md_theme_dark_onSurface">#E0E3E1</color>
+    <color name="md_theme_dark_surfaceVariant">#3F4946</color>
+    <color name="md_theme_dark_onSurfaceVariant">#BEC9C5</color>
+    <color name="md_theme_dark_outline">#899390</color>
     <color name="md_theme_dark_inverseOnSurface">#191C1B</color>
-    <color name="md_theme_dark_inverseSurface">#E1E3E0</color>
-    <color name="md_theme_dark_inversePrimary">#006B5A</color>
+    <color name="md_theme_dark_inverseSurface">#E0E3E1</color>
+    <color name="md_theme_dark_inversePrimary">#006B5E</color>
     <color name="md_theme_dark_shadow">#000000</color>
-    <color name="md_theme_dark_surfaceTint">#5BDBBF</color>
-    <color name="md_theme_dark_outlineVariant">#3F4945</color>
+    <color name="md_theme_dark_surfaceTint">#55DBC6</color>
+    <color name="md_theme_dark_outlineVariant">#3F4946</color>
     <color name="md_theme_dark_scrim">#000000</color>
 </resources>