diff --git a/ui/src/main/res/drawable/snabble_ic_plus.xml b/ui/src/main/res/drawable/snabble_ic_plus.xml
deleted file mode 100644
index d70710e924..0000000000
--- a/ui/src/main/res/drawable/snabble_ic_plus.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-
-</vector>
diff --git a/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml b/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml
index e24fc7f012..54f774ba28 100644
--- a/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml
+++ b/ui/src/main/res/layout/snabble_dialog_product_confirmation.xml
@@ -91,12 +91,12 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:importantForAccessibility="no"
-                android:src="@drawable/snabble_ic_minus"
+                android:src="@drawable/snabble_ic_minus_content"
                 app:tint="?attr/colorOnSurface" />
 
             <com.google.android.material.button.MaterialButton
@@ -145,12 +145,12 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:importantForAccessibility="no"
-                android:src="@drawable/snabble_ic_plus"
+                android:src="@drawable/snabble_ic_plus_content"
                 app:tint="?attr/colorOnSurface" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/ui/src/main/res/layout/snabble_view_checkout_bar.xml b/ui/src/main/res/layout/snabble_view_checkout_bar.xml
index 7570959e05..d8ca368da1 100644
--- a/ui/src/main/res/layout/snabble_view_checkout_bar.xml
+++ b/ui/src/main/res/layout/snabble_view_checkout_bar.xml
@@ -79,7 +79,7 @@
                         tools:src="@drawable/snabble_ic_payment_select_sepa"
                         android:importantForAccessibility="no" />
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/payment_chevron"
                         android:layout_width="7dp"
                         android:layout_height="7dp"
@@ -129,4 +129,4 @@
             android:layout_marginTop="12dp"
             android:layout_marginBottom="12dp"
             android:text="@string/Snabble.Shoppingcart.BuyProducts.selectPaymentMethod" />
-</merge>
\ No newline at end of file
+</merge>
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index c07947c59c..df1aaf1575 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -90,11 +90,11 @@
     </style>
 
     <style name="Widget.App.SnackbarText" parent="Widget.MaterialComponents.Snackbar.TextView">
-        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textColor">?attr/colorOnSecondaryContainer</item>
     </style>
 
     <style name="ThemeOverlay.App.Snackbar" parent="">
-        <item name="colorOnSurface">?attr/colorSurface</item>
+        <item name="colorOnSurface">?attr/colorSecondaryContainer</item>
     </style>
 
 </resources>