diff --git a/app/src/main/java/com/dano/test1/ui/DatabaseButtonHandler.kt b/app/src/main/java/com/dano/test1/ui/DatabaseButtonHandler.kt
index f4a0a74..1771dd5 100644
--- a/app/src/main/java/com/dano/test1/ui/DatabaseButtonHandler.kt
+++ b/app/src/main/java/com/dano/test1/ui/DatabaseButtonHandler.kt
@@ -7,8 +7,8 @@ import android.view.View
 import android.widget.*
 import com.dano.test1.data.ExcelExportService
 import com.dano.test1.utils.ViewUtils
+import androidx.appcompat.app.AppCompatActivity
 import com.dano.test1.LanguageManager
-import com.dano.test1.MainActivity
 import com.dano.test1.MyApp
 import com.dano.test1.R
 import com.dano.test1.data.Client
@@ -19,7 +19,7 @@ import kotlinx.coroutines.*
 import org.json.JSONArray
 
 class DatabaseButtonHandler(
-    private val activity: MainActivity,
+    private val activity: AppCompatActivity,
     private val databaseButton: Button,
     private val onClose: () -> Unit,
     private val languageIDProvider: () -> String = { "GERMAN" }
diff --git a/app/src/main/java/com/dano/test1/ui/DevSettingsActivity.kt b/app/src/main/java/com/dano/test1/ui/DevSettingsActivity.kt
index 16f0904..e818d83 100644
--- a/app/src/main/java/com/dano/test1/ui/DevSettingsActivity.kt
+++ b/app/src/main/java/com/dano/test1/ui/DevSettingsActivity.kt
@@ -1,6 +1,7 @@
 package com.dano.test1.ui
 
 import android.os.Bundle
+import android.widget.Button
 import android.widget.RadioButton
 import android.widget.RadioGroup
 import androidx.appcompat.app.AppCompatActivity
@@ -43,6 +44,13 @@ class DevSettingsActivity : AppCompatActivity() {
             }
             AbTestSettingsStore.setVariant(this, variant)
         }
+
+        val databaseButton = findViewById<Button>(R.id.databaseButton)
+        DatabaseButtonHandler(
+            activity = this,
+            databaseButton = databaseButton,
+            onClose = { recreate() }
+        ).setup()
     }
 
     private fun applyPrefsToUi() {
diff --git a/app/src/main/java/com/dano/test1/ui/HandlerOpeningScreen.kt b/app/src/main/java/com/dano/test1/ui/HandlerOpeningScreen.kt
index d6f86c3..e3606bf 100644
--- a/app/src/main/java/com/dano/test1/ui/HandlerOpeningScreen.kt
+++ b/app/src/main/java/com/dano/test1/ui/HandlerOpeningScreen.kt
@@ -45,7 +45,6 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
     private lateinit var editButton: Button
     private lateinit var uploadButton: Button
     private lateinit var downloadButton: Button
-    private lateinit var databaseButton: Button
     private lateinit var statusSession: TextView
     private lateinit var statusOnline: TextView
     private val SESSION_WARN_AFTER_MS = 12 * 60 * 60 * 1000L // 12h
@@ -97,7 +96,6 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         setupEditButtonHandler()
         setupUploadButton()
         setupDownloadButton()
-        setupDatabaseButtonHandler()
 
         uiHandler.removeCallbacks(statusTicker)
         updateStatusStrip()
@@ -129,7 +127,6 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         downloadButton = activity.findViewById(R.id.downloadButton)
         downloadButton.visibility = View.GONE
 
-        databaseButton = activity.findViewById(R.id.databaseButton)
         statusSession = activity.findViewById(R.id.statusSession)
         statusOnline = activity.findViewById(R.id.statusOnline)
         val tag = editText.tag as? String ?: ""
@@ -390,7 +387,6 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         editButton.text     = t("edit")
         uploadButton.text   = t("upload")
         downloadButton.text = t("download")
-        databaseButton.text = t("database")
         val hintTag = editText.tag as? String ?: ""
         editText.hint = t(hintTag)
         val coachTag = coachEditText.tag as? String ?: ""
@@ -533,17 +529,8 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
         }
     }
 
-    private fun setupDatabaseButtonHandler() {
-        DatabaseButtonHandler(
-            activity = activity,
-            databaseButton = databaseButton,
-            onClose = { init() },
-            languageIDProvider = { languageID }
-        ).setup()
-    }
-
     private fun updateMainButtonsState(isDatabaseAvailable: Boolean) {
-        listOf(buttonLoad, saveButton, editButton, databaseButton).forEach { b ->
+        listOf(buttonLoad, saveButton, editButton).forEach { b ->
             b.isEnabled = isDatabaseAvailable
             b.alpha = if (isDatabaseAvailable) 1.0f else 0.5f
         }
diff --git a/app/src/main/res/layout/activity_dev_settings.xml b/app/src/main/res/layout/activity_dev_settings.xml
index 0cbf9f1..7f0a95e 100644
--- a/app/src/main/res/layout/activity_dev_settings.xml
+++ b/app/src/main/res/layout/activity_dev_settings.xml
@@ -70,6 +70,27 @@
                     android:layout_height="wrap_content"
                     android:text="Variant B" />
             </RadioGroup>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="16dp"
+                android:background="#DDDDDD" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingBottom="8dp"
+                android:text="Database"
+                android:textStyle="bold" />
+
+            <Button
+                android:id="@+id/databaseButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Datenbank" />
+
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/opening_screen.xml b/app/src/main/res/layout/opening_screen.xml
index 3b7f589..f7b74f7 100644
--- a/app/src/main/res/layout/opening_screen.xml
+++ b/app/src/main/res/layout/opening_screen.xml
@@ -253,19 +253,6 @@
             style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="@dimen/pill_height"
-            android:layout_marginBottom="12dp"
-            android:textAllCaps="false"
-            android:textColor="@color/brand_purple"
-            app:cornerRadius="@dimen/pill_radius"
-            app:strokeColor="@color/brand_purple"
-            app:strokeWidth="@dimen/pill_stroke"
-            app:backgroundTint="@android:color/transparent"/>
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/databaseButton"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/pill_height"
             android:textAllCaps="false"
             android:textColor="@color/brand_purple"
             app:cornerRadius="@dimen/pill_radius"