diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 25f3cbc98..b0198deac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,7 +39,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".git.GitActivity" />
+        <activity android:name=".git.GitOperationActivity"
+            android:theme="@style/NoBackgroundTheme" />
 
         <activity android:name=".git.GitServerConfigActivity"
             android:windowSoftInputMode="adjustResize"
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt
index a539fa7fb..ccddb0f75 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.kt
@@ -24,7 +24,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import com.zeapo.pwdstore.databinding.PasswordRecyclerViewBinding
 import com.zeapo.pwdstore.git.BaseGitActivity
-import com.zeapo.pwdstore.git.GitActivity
+import com.zeapo.pwdstore.git.GitOperationActivity
 import com.zeapo.pwdstore.ui.OnOffItemAnimator
 import com.zeapo.pwdstore.ui.adapters.PasswordItemRecyclerAdapter
 import com.zeapo.pwdstore.utils.PasswordItem
@@ -78,8 +78,8 @@ class PasswordFragment : Fragment() {
                     .show()
                 swipeRefresher.isRefreshing = false
             } else {
-                val intent = Intent(context, GitActivity::class.java)
-                intent.putExtra("Operation", BaseGitActivity.REQUEST_SYNC)
+                val intent = Intent(context, GitOperationActivity::class.java)
+                intent.putExtra(BaseGitActivity.REQUEST_ARG_OP, BaseGitActivity.REQUEST_SYNC)
                 startActivityForResult(intent, BaseGitActivity.REQUEST_SYNC)
             }
         }
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt
index cab055dda..2b680472f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt
@@ -39,7 +39,7 @@ import com.zeapo.pwdstore.autofill.oreo.AutofillMatcher
 import com.zeapo.pwdstore.crypto.PgpActivity
 import com.zeapo.pwdstore.crypto.PgpActivity.Companion.getLongName
 import com.zeapo.pwdstore.git.BaseGitActivity
-import com.zeapo.pwdstore.git.GitActivity
+import com.zeapo.pwdstore.git.GitOperationActivity
 import com.zeapo.pwdstore.git.GitAsyncTask
 import com.zeapo.pwdstore.git.GitOperation
 import com.zeapo.pwdstore.git.GitServerConfigActivity
@@ -251,8 +251,8 @@ class PasswordStore : AppCompatActivity() {
                     initBefore.show()
                     return false
                 }
-                intent = Intent(this, GitActivity::class.java)
-                intent.putExtra("Operation", BaseGitActivity.REQUEST_PUSH)
+                intent = Intent(this, GitOperationActivity::class.java)
+                intent.putExtra(BaseGitActivity.REQUEST_ARG_OP, BaseGitActivity.REQUEST_PUSH)
                 startActivityForResult(intent, BaseGitActivity.REQUEST_PUSH)
                 return true
             }
@@ -261,8 +261,8 @@ class PasswordStore : AppCompatActivity() {
                     initBefore.show()
                     return false
                 }
-                intent = Intent(this, GitActivity::class.java)
-                intent.putExtra("Operation", BaseGitActivity.REQUEST_PULL)
+                intent = Intent(this, GitOperationActivity::class.java)
+                intent.putExtra(BaseGitActivity.REQUEST_ARG_OP, BaseGitActivity.REQUEST_PULL)
                 startActivityForResult(intent, BaseGitActivity.REQUEST_PULL)
                 return true
             }
@@ -271,8 +271,8 @@ class PasswordStore : AppCompatActivity() {
                     initBefore.show()
                     return false
                 }
-                intent = Intent(this, GitActivity::class.java)
-                intent.putExtra("Operation", BaseGitActivity.REQUEST_SYNC)
+                intent = Intent(this, GitOperationActivity::class.java)
+                intent.putExtra(BaseGitActivity.REQUEST_ARG_OP, BaseGitActivity.REQUEST_SYNC)
                 startActivityForResult(intent, BaseGitActivity.REQUEST_SYNC)
                 return true
             }
@@ -551,7 +551,7 @@ class PasswordStore : AppCompatActivity() {
             fileLocations.add(file.absolutePath)
         }
         intent.putExtra("Files", fileLocations)
-        intent.putExtra("Operation", "SELECTFOLDER")
+        intent.putExtra(BaseGitActivity.REQUEST_ARG_OP, "SELECTFOLDER")
         startActivityForResult(intent, REQUEST_CODE_SELECT_FOLDER)
     }
 
@@ -640,8 +640,8 @@ class PasswordStore : AppCompatActivity() {
                             return // if not empty, just show me the passwords!
                         }
                     }
-                    val intent = Intent(activity, GitActivity::class.java)
-                    intent.putExtra("Operation", BaseGitActivity.REQUEST_CLONE)
+                    val intent = Intent(activity, GitOperationActivity::class.java)
+                    intent.putExtra(BaseGitActivity.REQUEST_ARG_OP, BaseGitActivity.REQUEST_CLONE)
                     startActivityForResult(intent, BaseGitActivity.REQUEST_CLONE)
                 }
                 REQUEST_CODE_SELECT_FOLDER -> {
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
index a8a60a2f1..552deb613 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
@@ -64,6 +64,15 @@ abstract class BaseGitActivity : AppCompatActivity() {
         }
     }
 
+    override fun onDestroy() {
+        // Do not leak the service connection
+        if (identityBuilder != null) {
+            identityBuilder!!.close()
+            identityBuilder = null
+        }
+        super.onDestroy()
+    }
+
     /**
      * Update the [hostname] field with the values that build it up. This function returns a boolean
      * indicating whether or not the values are valid or not, and only adds the `origin` remote when
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt
similarity index 90%
rename from app/src/main/java/com/zeapo/pwdstore/git/GitActivity.kt
rename to app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt
index 4da6d1f9d..99c3e21e2 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperationActivity.kt
@@ -14,18 +14,12 @@ import com.zeapo.pwdstore.UserPreference
 import com.zeapo.pwdstore.git.config.SshApiSessionFactory
 import com.zeapo.pwdstore.utils.PasswordRepository
 
-open class GitActivity : BaseGitActivity() {
+open class GitOperationActivity : BaseGitActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val operationCode = intent.extras!!.getInt("Operation")
-
-        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
-
-        when (operationCode) {
+        when (intent.extras?.getInt(REQUEST_ARG_OP)) {
             REQUEST_PULL -> syncRepository(REQUEST_PULL)
-
             REQUEST_PUSH -> syncRepository(REQUEST_PUSH)
-
             REQUEST_SYNC -> syncRepository(REQUEST_SYNC)
         }
     }
@@ -34,15 +28,6 @@ open class GitActivity : BaseGitActivity() {
         super.onResume()
     }
 
-    override fun onDestroy() {
-        // Do not leak the service connection
-        if (identityBuilder != null) {
-            identityBuilder!!.close()
-            identityBuilder = null
-        }
-        super.onDestroy()
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         // Inflate the menu; this adds items to the action bar if it is present.
         menuInflater.inflate(R.menu.git_clone, menu)
@@ -91,7 +76,6 @@ open class GitActivity : BaseGitActivity() {
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-
         // In addition to the pre-operation-launch series of intents for OpenKeychain auth
         // that will pass through here and back to launchGitOperation, there is one
         // synchronous operation that happens /after/ the operation has been launched in the
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index 202046b64..27d480b46 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:padding="@dimen/activity_horizontal_margin"
-    tools:context="com.zeapo.pwdstore.git.GitActivity"
+    tools:context="com.zeapo.pwdstore.git.GitOperationActivity"
     android:background="?android:attr/windowBackground">
 
     <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml
index 8c737da40..94c09e271 100644
--- a/app/src/main/res/layout/activity_git_config.xml
+++ b/app/src/main/res/layout/activity_git_config.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:padding="@dimen/activity_horizontal_margin"
     android:background="?android:attr/windowBackground"
-    tools:context="com.zeapo.pwdstore.git.GitActivity"
+    tools:context="com.zeapo.pwdstore.git.GitConfigActivity"
     tools:layout_editor_absoluteX="0dp"
     tools:layout_editor_absoluteY="81dp">
 
diff --git a/app/src/main/res/menu/git_clone.xml b/app/src/main/res/menu/git_clone.xml
index 092a8b2bd..d170cca80 100644
--- a/app/src/main/res/menu/git_clone.xml
+++ b/app/src/main/res/menu/git_clone.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:pwstore="http://schemas.android.com/apk/res-auto"
-    tools:context="com.zeapo.pwdstore.git.GitActivity" >
+    tools:context="com.zeapo.pwdstore.git.GitServerConfigActivity" >
     <item android:id="@+id/user_pref"
         android:title="@string/action_settings"
         android:orderInCategory="100"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 090b56b9b..3d90a8deb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -33,6 +33,21 @@
         <item name="background">@color/primary_color</item>
     </style>
 
+    <style name="NoBackgroundTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:navigationBarColor">@color/navigation_bar_color</item>
+        <item name="android:statusBarColor">@color/status_bar_color</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
+        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
+        <item name="colorPrimaryDark">@android:color/transparent</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
         <item name="colorControlActivated">@color/color_control_normal</item>
     </style>