diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp
index 910f82535..fc3f7ce31 100644
--- a/cockatrice/src/client/settings/cache_settings.cpp
+++ b/cockatrice/src/client/settings/cache_settings.cpp
@@ -274,7 +274,7 @@ SettingsCache::SettingsCache()
     localCardImageStorageNamingScheme =
         settings
             ->value("personal/localCardImageStorageNamingScheme",
-                    static_cast<int>(CardPictureLoaderLocalSchemes::NamingScheme::Set_Folder_Name_ProviderId))
+                    static_cast<int>(CardPictureLoaderLocalSchemes::NamingScheme::Set_Folder_Name_Set_Collector))
             .toInt();
 
     picDownload = settings->value("personal/picturedownload", true).toBool();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
index 818908706..eed9acf39 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@@ -1343,10 +1343,10 @@ StorageSettingsPage::StorageSettingsPage()
     lpImageBackupGrid->addWidget(&imageBackupExplainerLabel, 0, 0, 1, 2);
     lpImageBackupGrid->addWidget(&localCardImageStorageNamingSchemeLabel, 1, 0);
     lpImageBackupGrid->addWidget(localCardImageStorageNamingSchemeComboBox, 1, 1);
-    lpImageBackupGrid->addWidget(&clearBackupsButton, 2, 1);
+    lpImageBackupGrid->addWidget(&clearBackupsButton, 2, 0);
 
     lpPixmapCacheGrid->addWidget(&pixmapCacheExplainerLabel, 0, 0);
-    lpPixmapCacheGrid->addLayout(pixmapCacheLayout, 1, 1);
+    lpPixmapCacheGrid->addLayout(pixmapCacheLayout, 1, 0);
 
     connect(&pixmapCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
             &SettingsCache::setPixmapCacheSize);