diff --git a/app/src/main/java/com/finnmglas/launcher/Functions.kt b/app/src/main/java/com/finnmglas/launcher/Functions.kt
index 43261be..ee006c7 100644
--- a/app/src/main/java/com/finnmglas/launcher/Functions.kt
+++ b/app/src/main/java/com/finnmglas/launcher/Functions.kt
@@ -179,13 +179,15 @@ fun getSavedTheme(context : Context) : String {
     return sharedPref.getString("theme", "finn").toString()
 }
 
-fun saveTheme(context : Context, themeName : String) {
+fun saveTheme(context : Context, themeName : String) : String {
     val sharedPref = context.getSharedPreferences(
         context.getString(R.string.preference_file_key), Context.MODE_PRIVATE)
 
     val editor: SharedPreferences.Editor = sharedPref.edit()
     editor.putString("theme", themeName)
     editor.apply()
+
+    return themeName
 }
 
 fun openAppSettings(pkg :String, context:Context){
diff --git a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
index 71a9b02..cc09fbf 100644
--- a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
@@ -50,6 +50,9 @@ class MainActivity : AppCompatActivity(),
 
         currentTheme = getSavedTheme(this)
 
+        if (currentTheme == "custom" && background == null)
+            currentTheme = saveTheme(this, "finn")
+
         setTheme(
             when (currentTheme) {
                 "dark" -> R.style.darkTheme
@@ -92,9 +95,8 @@ class MainActivity : AppCompatActivity(),
 
         // TODO: do this immediately after changing preferences
         if (currentTheme != getSavedTheme(this)) recreate()
-        if (background != null) {
+        if (background_image != null && getSavedTheme(this) == "custom")
             background_image.setImageBitmap(background)
-        }
 
         val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
         val timeFormat = SimpleDateFormat("HH:mm:ss", Locale.getDefault())
diff --git a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
index ca2dfaa..6b44bd8 100644
--- a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt
@@ -55,7 +55,9 @@ class SettingsActivity : AppCompatActivity() {
                     when (getSavedTheme(container!!.context)) {
                         "dark" -> select_theme_dark.visibility = View.INVISIBLE
                         "finn" -> select_theme_finn.visibility = View.INVISIBLE
-                        "custom" -> select_theme_custom.visibility = View.INVISIBLE
+                        "custom" -> {
+                            select_theme_custom.text = getString(R.string.settings_select_image)
+                        }
                     }
                 }
             }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 10235bd..9e8e65c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -34,6 +34,7 @@
     <string name="settings_toast_store_not_found">PlayStore nicht gefunden</string>
 
     <string name="settings_select_theme">Wählen</string>
+    <string name="settings_select_image">Bild ändern</string>
 
     <string name="settings_footer_by">Von</string>
     <string name="settings_footer_repo">https://github.com/finnmglas/Launcher#de</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 661a5c3..e0b13ed 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -34,6 +34,7 @@
     <string name="settings_toast_store_not_found">Pas trouvé le PlayStore</string>
 
     <string name="settings_select_theme">Choisir</string>
+    <string name="settings_select_image">Changer Image</string>
 
     <string name="settings_footer_by">Par</string>
     <string name="settings_footer_web">https://www.finnmglas.com/fr/</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 518e1d1..68b9395 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="settings_toast_store_not_found">PlayStore not found</string>
 
     <string name="settings_select_theme">Select</string>
+    <string name="settings_select_image">Change Image</string>
 
     <string name="settings_footer_by">By</string>
     <string name="settings_footer_repo">https://github.com/finnmglas/Launcher#en</string>