diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 4b312c7a6..083124c3d 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -23,50 +23,6 @@
             column="3"/>
     </issue>
 
-    <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `?android:attr/windowBackground` with a theme that also paints a background (inferred theme is `@style/AppThemeM3`)"
-        errorLine1="  android:background=&quot;?android:attr/windowBackground&quot;"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/activity_git_clone.xml"
-            line="11"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `?android:attr/colorBackground` with a theme that also paints a background (inferred theme is `@style/AppThemeM3`)"
-        errorLine1="  android:background=&quot;?android:attr/colorBackground&quot;>"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_clone.xml"
-            line="10"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `?android:attr/colorBackground` with a theme that also paints a background (inferred theme is `@style/AppThemeM3`)"
-        errorLine1="  android:background=&quot;?android:attr/colorBackground&quot;"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_key_selection.xml"
-            line="10"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `?android:attr/colorBackground` with a theme that also paints a background (inferred theme is `@style/AppThemeM3`)"
-        errorLine1="  android:background=&quot;?android:attr/colorBackground&quot;"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_welcome.xml"
-            line="10"
-            column="3"/>
-    </issue>
-
     <issue
         id="Autofill"
         message="Missing `autofillHints` attribute"
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index 6c991faa4..7980f7381 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -8,9 +8,7 @@
   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 cb2cc04ea..f85cafacb 100644
--- a/app/src/main/res/layout/fragment_clone.xml
+++ b/app/src/main/res/layout/fragment_clone.xml
@@ -6,8 +6,7 @@
 <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:background="?android:attr/colorBackground">
+  android:layout_height="match_parent">
 
   <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 937d87519..bc4f53678 100644
--- a/app/src/main/res/layout/fragment_key_selection.xml
+++ b/app/src/main/res/layout/fragment_key_selection.xml
@@ -7,7 +7,6 @@
   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 18e900823..0e71b88de 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -7,7 +7,6 @@
   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