diff --git a/app/lint.xml b/app/lint.xml
index 29ad01f4..94b241ca 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -13,6 +13,12 @@
   <issue id="MissingQuantity">
     <ignore path="src/main/res/values-fr/strings.xml" />
   </issue>
+  <issue id="Overdraw">
+    <ignore path="src/main/res/layout/activity_git_clone.xml" />
+    <ignore path="src/main/res/layout/fragment_clone.xml" />
+    <ignore path="src/main/res/layout/fragment_key_selection.xml" />
+    <ignore path="src/main/res/layout/fragment_welcome.xml" />
+  </issue>
   <issue id="TrustAllX509TrustManager">
     <ignore regexp="bouncycastle" />
     <ignore regexp="eclipse/jgit" />
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index 7980f738..6c991faa 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -8,7 +8,9 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:background="?android:attr/windowBackground"
   android:padding="@dimen/activity_horizontal_margin"
+  tools:background="@color/white"
   tools:context="dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity">
 
   <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_clone.xml b/app/src/main/res/layout/fragment_clone.xml
index f85cafac..cb2cc04e 100644
--- a/app/src/main/res/layout/fragment_clone.xml
+++ b/app/src/main/res/layout/fragment_clone.xml
@@ -6,7 +6,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  android:background="?android:attr/colorBackground">
 
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_key_selection.xml b/app/src/main/res/layout/fragment_key_selection.xml
index bc4f5367..937d8751 100644
--- a/app/src/main/res/layout/fragment_key_selection.xml
+++ b/app/src/main/res/layout/fragment_key_selection.xml
@@ -7,6 +7,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:background="?android:attr/colorBackground"
   android:orientation="vertical">
 
   <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index 0e71b88d..18e90082 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -7,6 +7,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:background="?android:attr/colorBackground"
   android:orientation="vertical">
 
   <com.google.android.material.button.MaterialButton