diff --git a/library/ui-styles/src/debug/res/layout/debug_social_login.xml b/library/ui-styles/src/debug/res/layout/debug_social_login.xml
new file mode 100644
index 0000000000..895ecddad4
--- /dev/null
+++ b/library/ui-styles/src/debug/res/layout/debug_social_login.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#DDD"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:ignore="HardcodedText">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Light" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:background="@color/element_background_light"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Dark" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:background="@color/element_background_dark"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+        <Button
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Continue with XXX" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_social_login.xml b/library/ui-styles/src/main/res/values/styles_social_login.xml
index b527d5bfdc..f601f36480 100644
--- a/library/ui-styles/src/main/res/values/styles_social_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_social_login.xml
@@ -9,7 +9,7 @@
         <item name="iconGravity">start</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">center</item>
-        <item name="android:paddingStart">2dp</item>
+        <item name="android:paddingStart">4dp</item>
         <!-- Compensate icon size to center text correctly-->
         <item name="android:paddingEnd">38dp</item>
         <item name="android:clipToPadding">false</item>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 4d525f7eee..b828855721 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -129,7 +129,9 @@
         <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
         <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
 
-        <item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Dark</item>
+        <!-- For Google button style, use same values than for light theme, for a better rendering (white background)
+        see https://github.com/vector-im/element-android/issues/4285#issuecomment-974270998 -->
+        <item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Light</item>
         <item name="vctr_social_login_button_github_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Github.Dark</item>
         <item name="vctr_social_login_button_facebook_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Facebook.Dark</item>
         <item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark</item>