diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index b57a561..76fc21a 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index a8494d8..09d64c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "at.smartshopper.smartshopperapp"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 13
-        versionName "4.3"
+        versionCode 14
+        versionName "4.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/release/app.aab b/app/release/app.aab
index f3a43a9..b82237c 100644
Binary files a/app/release/app.aab and b/app/release/app.aab differ
diff --git a/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java
index a22ad30..f90b714 100644
--- a/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java
+++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java
@@ -4,6 +4,7 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
@@ -11,6 +12,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
@@ -96,7 +98,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte
             if (resultCode == RESULT_OK) {
                 int color = Integer.parseInt(data.getData().toString());
                 this.color = colorToHexString(color);
-                colorBtn.setBackgroundColor(Color.parseColor(this.color));
+                colorBtn.setBackgroundTintList(ColorStateList.valueOf(color));
             }
         }
     }
diff --git a/app/src/main/java/at/smartshopper/smartshopperapp/activitys/ShoppinglistDetails.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/ShoppinglistDetails.java
index 2ed83c3..b08be24 100644
--- a/app/src/main/java/at/smartshopper/smartshopperapp/activitys/ShoppinglistDetails.java
+++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/ShoppinglistDetails.java
@@ -1,6 +1,7 @@
 package at.smartshopper.smartshopperapp.activitys;
 
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
@@ -349,7 +350,7 @@ public class ShoppinglistDetails extends AppCompatActivity implements DetailsAda
                     colorstring = "#" + this.colorString;
                 }
                 int colorint = Color.parseColor(colorstring);
-                colorBtn.setBackgroundColor(colorint);
+                colorBtn.setBackgroundTintList(ColorStateList.valueOf(colorint));
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index a439d9e..bd876bc 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -69,7 +69,7 @@
 
             <Button
                 android:id="@+id/loginEmailBtn"
-                style="@style/Widget.AppCompat.Button.Colored"
+                style="@style/AppTheme"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/colorButton"
diff --git a/app/src/main/res/layout/add_group_dialog.xml b/app/src/main/res/layout/add_group_dialog.xml
index 640c96b..1e3090d 100644
--- a/app/src/main/res/layout/add_group_dialog.xml
+++ b/app/src/main/res/layout/add_group_dialog.xml
@@ -95,7 +95,7 @@
                     style="@style/Widget.AppCompat.Button.Colored"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorButton"
+                    android:backgroundTint="#00b7ff"
                     android:text="Farbe Auswählen" />
             </LinearLayout>
         </TableRow>
@@ -116,6 +116,7 @@
                     style="@style/Widget.AppCompat.Button.Colored"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:backgroundTint="#00b7ff"
                     android:text="Fertig" />
             </LinearLayout>
         </TableRow>
diff --git a/app/src/main/res/layout/add_item_dialog.xml b/app/src/main/res/layout/add_item_dialog.xml
index 3a968e5..7ffd386 100644
--- a/app/src/main/res/layout/add_item_dialog.xml
+++ b/app/src/main/res/layout/add_item_dialog.xml
@@ -122,6 +122,7 @@
                     style="@style/Widget.AppCompat.Button.Colored"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:backgroundTint="#00b7ff"
                     android:text="Fertig" />
             </LinearLayout>
         </TableRow>
diff --git a/app/src/main/res/layout/add_share.xml b/app/src/main/res/layout/add_share.xml
index c9cebee..e70ee22 100644
--- a/app/src/main/res/layout/add_share.xml
+++ b/app/src/main/res/layout/add_share.xml
@@ -102,6 +102,7 @@
                 style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:backgroundTint="#00b7ff"
                 android:text=" Share Aufheben" />
         </TableRow>
 
diff --git a/app/src/main/res/layout/add_share_link.xml b/app/src/main/res/layout/add_share_link.xml
index 5ba1a5d..0548427 100644
--- a/app/src/main/res/layout/add_share_link.xml
+++ b/app/src/main/res/layout/add_share_link.xml
@@ -72,6 +72,7 @@
                 style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:backgroundTint="#00b7ff"
                 android:text="Fertig" />
         </TableRow>
 
diff --git a/app/src/main/res/layout/add_shoppinglist_dialog.xml b/app/src/main/res/layout/add_shoppinglist_dialog.xml
index 2262278..c12e016 100644
--- a/app/src/main/res/layout/add_shoppinglist_dialog.xml
+++ b/app/src/main/res/layout/add_shoppinglist_dialog.xml
@@ -132,7 +132,8 @@
                     style="@style/Widget.AppCompat.Button.Colored"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:backgroundTint="#00b7ff"
+                    android:backgroundTintMode="src_atop"
                     android:text="Farbe auswählen" />
             </LinearLayout>
         </TableRow>
@@ -153,6 +154,7 @@
                     style="@style/Widget.AppCompat.Button.Colored"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:backgroundTint="#00b7ff"
                     android:text="Fertig" />
             </LinearLayout>
         </TableRow>
diff --git a/app/src/main/res/layout/edit_share_member.xml b/app/src/main/res/layout/edit_share_member.xml
index b88ac52..8385f0d 100644
--- a/app/src/main/res/layout/edit_share_member.xml
+++ b/app/src/main/res/layout/edit_share_member.xml
@@ -80,6 +80,7 @@
                 style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:backgroundTint="#00b7ff"
                 android:text="Listen Sharing beenden!" />
         </TableRow>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2fd853e..d4f35c1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#FFFFFF</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#880e4f</color>
+    <color name="colorPrimaryDark">#176988</color>
+    <color name="colorAccent">#00b7ff</color>
     <color name="colorButton"></color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f1a72dc..dc1092b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light">
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="colorButtonNormal">@color/colorAccent</item>
+        <item name="colorControlHighlight">@color/colorPrimaryDark</item>
+        <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
     </style>
 
     <style name="popup_window_animation_phone">