diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 1ae6fb11ad..3a23c65a13 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -313,7 +313,7 @@ public class FragmentSetup extends FragmentBase {
                                         .putExtra("pop", provider.pop != null));
                         // https://developers.google.com/identity/branding-guidelines
                         resid = ("gmail".equals(provider.id)
-                                ? R.drawable.google_signin
+                                ? R.drawable.btn_google_light_normal
                                 : res.getIdentifier("provider_" + provider.id, "drawable", pkg));
                         if (resid != 0)
                             item.setIcon(resid);
diff --git a/app/src/main/res/drawable-hdpi/btn_google_light_disabled.9.png b/app/src/main/res/drawable-hdpi/btn_google_light_disabled.9.png
deleted file mode 100644
index 2d2ee9f3ae..0000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_google_light_disabled.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_google_light_focus.9.png b/app/src/main/res/drawable-hdpi/btn_google_light_focus.9.png
deleted file mode 100644
index 1c2e344888..0000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_google_light_focus.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_google_light_normal.9.png b/app/src/main/res/drawable-hdpi/btn_google_light_normal.9.png
deleted file mode 100644
index 9faa971d64..0000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_google_light_normal.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_google_light_pressed.9.png b/app/src/main/res/drawable-hdpi/btn_google_light_pressed.9.png
deleted file mode 100644
index 7fbfd68624..0000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_google_light_pressed.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_google_light_disabled.9.png b/app/src/main/res/drawable-mdpi/btn_google_light_disabled.9.png
deleted file mode 100644
index b67ef7d1bf..0000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_google_light_disabled.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_google_light_focus.9.png b/app/src/main/res/drawable-mdpi/btn_google_light_focus.9.png
deleted file mode 100644
index c444d0de28..0000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_google_light_focus.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_google_light_normal.9.png b/app/src/main/res/drawable-mdpi/btn_google_light_normal.9.png
deleted file mode 100644
index 44d5229a54..0000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_google_light_normal.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_google_light_pressed.9.png b/app/src/main/res/drawable-mdpi/btn_google_light_pressed.9.png
deleted file mode 100644
index 22767c35df..0000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_google_light_pressed.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_google_light_disabled.9.png b/app/src/main/res/drawable-xhdpi/btn_google_light_disabled.9.png
deleted file mode 100644
index 91ca1e89a3..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_google_light_disabled.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_google_light_focus.9.png b/app/src/main/res/drawable-xhdpi/btn_google_light_focus.9.png
deleted file mode 100644
index bb2b41e9ad..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_google_light_focus.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_google_light_normal.9.png b/app/src/main/res/drawable-xhdpi/btn_google_light_normal.9.png
deleted file mode 100644
index cfed22694b..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_google_light_normal.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_google_light_pressed.9.png b/app/src/main/res/drawable-xhdpi/btn_google_light_pressed.9.png
deleted file mode 100644
index 16210b4538..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_google_light_pressed.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_google_light_disabled.9.png b/app/src/main/res/drawable-xxhdpi/btn_google_light_disabled.9.png
deleted file mode 100644
index 9817625bc7..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_google_light_disabled.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_google_light_focus.9.png b/app/src/main/res/drawable-xxhdpi/btn_google_light_focus.9.png
deleted file mode 100644
index 4b5bae0fe2..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_google_light_focus.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_google_light_normal.9.png b/app/src/main/res/drawable-xxhdpi/btn_google_light_normal.9.png
deleted file mode 100644
index dde35a312f..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_google_light_normal.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_google_light_pressed.9.png b/app/src/main/res/drawable-xxhdpi/btn_google_light_pressed.9.png
deleted file mode 100644
index 4f1cd5eeff..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_google_light_pressed.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_google_light_disabled.9.png b/app/src/main/res/drawable-xxxhdpi/btn_google_light_disabled.9.png
deleted file mode 100644
index 79b569e1a0..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/btn_google_light_disabled.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_google_light_focus.9.png b/app/src/main/res/drawable-xxxhdpi/btn_google_light_focus.9.png
deleted file mode 100644
index 1105ca11b3..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/btn_google_light_focus.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_google_light_normal.9.png b/app/src/main/res/drawable-xxxhdpi/btn_google_light_normal.9.png
deleted file mode 100644
index 5106157517..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/btn_google_light_normal.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_google_light_pressed.9.png b/app/src/main/res/drawable-xxxhdpi/btn_google_light_pressed.9.png
deleted file mode 100644
index 30dcbc4d3d..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/btn_google_light_pressed.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable/google_signin.xml b/app/src/main/res/drawable/google_signin.xml
deleted file mode 100644
index dc1d99c761..0000000000
--- a/app/src/main/res/drawable/google_signin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_enabled="true"
-        android:state_pressed="false"
-        android:state_focused="false"
-        android:drawable="@drawable/btn_google_light_normal" />
-
-    <item
-        android:state_enabled="true"
-        android:state_pressed="false"
-        android:state_focused="true"
-        android:drawable="@drawable/btn_google_light_focus" />
-
-    <item
-        android:state_enabled="true"
-        android:state_pressed="true"
-        android:drawable="@drawable/btn_google_light_pressed" />
-
-    <item
-        android:state_enabled="false"
-        android:drawable="@drawable/btn_google_light_disabled" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/resExtra/drawable/btn_google_light_normal.xml b/app/src/main/resExtra/drawable/btn_google_light_normal.xml
new file mode 100644
index 0000000000..5c330c1495
--- /dev/null
+++ b/app/src/main/resExtra/drawable/btn_google_light_normal.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="46dp"
+    android:height="46dp"
+    android:viewportWidth="46"
+    android:viewportHeight="46">
+    <group
+        android:pivotX="23"
+        android:pivotY="23"
+        android:scaleX="2"
+        android:scaleY="2">
+        <path
+            android:fillColor="#4285F4"
+            android:fillType="evenOdd"
+            android:pathData="M31.64,23.205C31.64,22.566 31.583,21.953 31.476,21.364L23,21.364L23,24.845L27.844,24.845C27.635,25.97 27.001,26.923 26.048,27.561L26.048,29.82L28.956,29.82C30.658,28.253 31.64,25.945 31.64,23.205L31.64,23.205Z"
+            android:strokeWidth="1"
+            android:strokeColor="#00000000" />
+        <path
+            android:fillColor="#34A853"
+            android:fillType="evenOdd"
+            android:pathData="M23,32C25.43,32 27.467,31.194 28.956,29.82L26.048,27.561C25.242,28.101 24.211,28.42 23,28.42C20.656,28.42 18.672,26.837 17.964,24.71L14.957,24.71L14.957,27.042C16.438,29.983 19.482,32 23,32L23,32Z"
+            android:strokeWidth="1"
+            android:strokeColor="#00000000" />
+        <path
+            android:fillColor="#FBBC05"
+            android:fillType="evenOdd"
+            android:pathData="M17.964,24.71C17.784,24.17 17.682,23.593 17.682,23C17.682,22.407 17.784,21.83 17.964,21.29L17.964,18.958L14.957,18.958C14.348,20.173 14,21.548 14,23C14,24.452 14.348,25.827 14.957,27.042L17.964,24.71L17.964,24.71Z"
+            android:strokeWidth="1"
+            android:strokeColor="#00000000" />
+        <path
+            android:fillColor="#EA4335"
+            android:fillType="evenOdd"
+            android:pathData="M23,17.58C24.321,17.58 25.508,18.034 26.44,18.925L29.022,16.344C27.463,14.892 25.426,14 23,14C19.482,14 16.438,16.017 14.957,18.958L17.964,21.29C18.672,19.163 20.656,17.58 23,17.58L23,17.58Z"
+            android:strokeWidth="1"
+            android:strokeColor="#00000000" />
+    </group>
+</vector>