diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 64c97b9..79ccbd6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/darkTheme">
+        android:theme="@style/finnmglasTheme">
 
         <activity android:name=".MainActivity"
             android:screenOrientation="portrait"
diff --git a/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt b/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
index 8d609ee..56a9e97 100644
--- a/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
@@ -27,6 +27,9 @@ class ChooseActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_choose)
 
+        // As older APIs somehow do not recognize the xml defined onClick
+        close_chooser.setOnClickListener() { finish() }
+
         val bundle = intent.extras
         val action = bundle!!.getString("action") // why choose an app
         val forApp = bundle.getString("forApp") // which app we choose
diff --git a/app/src/main/java/com/finnmglas/launcher/FirstStartupActivity.kt b/app/src/main/java/com/finnmglas/launcher/FirstStartupActivity.kt
index 70052ee..e849653 100644
--- a/app/src/main/java/com/finnmglas/launcher/FirstStartupActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/FirstStartupActivity.kt
@@ -44,6 +44,9 @@ class FirstStartupActivity : AppCompatActivity(){
             defaultApps = resetSettings(sharedPref, this) // UP, DOWN, RIGHT, LEFT, VOLUME_UP, VOLUME_DOWN
         else
             app_bar.visibility = View.VISIBLE
+
+        // As older APIs somehow do not recognize the xml defined onClick
+        close_tutorial.setOnClickListener() { finish() }
     }
 
     /** Touch- and Key-related functions to navigate */
diff --git a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
index 27e58f2..2a48e33 100644
--- a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
@@ -51,10 +51,7 @@ class MainActivity : AppCompatActivity(),
         showSettingsIcon()
 
         // As older APIs somehow do not recognize the xml defined onClick
-        findViewById<View>(R.id.settingstooltip).setOnClickListener() {
-            openSettings()
-            true
-        }
+        settingstooltip.setOnClickListener() { openSettings() }
 
         // First Startup
         if (!sharedPref.getBoolean("startedBefore", false)){
diff --git a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
index 6460bda..f068b94 100644
--- a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
@@ -32,6 +32,9 @@ class SettingsActivity : AppCompatActivity() {
         viewPager.adapter = sectionsPagerAdapter
         val tabs: TabLayout = findViewById(R.id.tabs)
         tabs.setupWithViewPager(viewPager)
+
+        // As older APIs somehow do not recognize the xml defined onClick
+        close_settings.setOnClickListener() { finish() }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/res/layout/activity_choose.xml b/app/src/main/res/layout/activity_choose.xml
index fd287fd..bdf723e 100644
--- a/app/src/main/res/layout/activity_choose.xml
+++ b/app/src/main/res/layout/activity_choose.xml
@@ -36,7 +36,7 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <com.finnmglas.launcher.FontAwesome
-                android:id="@+id/close_settings"
+                android:id="@+id/close_chooser"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_settings_apps.xml b/app/src/main/res/layout/fragment_settings_apps.xml
index 1dc16f2..1a0d25a 100644
--- a/app/src/main/res/layout/fragment_settings_apps.xml
+++ b/app/src/main/res/layout/fragment_settings_apps.xml
@@ -8,7 +8,9 @@
     android:background="?attr/colorPrimary"
     android:gravity="center|top"
     android:orientation="vertical"
-    android:padding="32sp"
+    android:paddingTop="16sp"
+    android:paddingLeft="32sp"
+    android:paddingRight="32sp"
     tools:context=".SettingsActivity">
 
     <TableLayout
diff --git a/app/src/main/res/layout/fragment_settings_launcher.xml b/app/src/main/res/layout/fragment_settings_launcher.xml
index 49f7a5d..5ecb7a0 100644
--- a/app/src/main/res/layout/fragment_settings_launcher.xml
+++ b/app/src/main/res/layout/fragment_settings_launcher.xml
@@ -8,7 +8,9 @@
     android:background="?attr/colorPrimary"
     android:gravity="center|top"
     android:orientation="vertical"
-    android:padding="32sp"
+    android:paddingTop="16sp"
+    android:paddingLeft="32sp"
+    android:paddingRight="32sp"
     tools:context=".SettingsActivity">
 
     <Button
diff --git a/app/src/main/res/layout/fragment_settings_theme.xml b/app/src/main/res/layout/fragment_settings_theme.xml
index c3b8cf0..b3f79d5 100644
--- a/app/src/main/res/layout/fragment_settings_theme.xml
+++ b/app/src/main/res/layout/fragment_settings_theme.xml
@@ -9,7 +9,7 @@
     android:gravity="center"
     android:orientation="vertical"
     android:paddingLeft="32sp"
-    android:paddingTop="32sp"
+    android:paddingTop="16sp"
     android:paddingRight="32sp"
     tools:context=".SettingsActivity">