diff --git a/src/core/file_sys/control_metadata.h b/src/core/file_sys/control_metadata.h
index 9fc02612ab..6582cc2403 100644
--- a/src/core/file_sys/control_metadata.h
+++ b/src/core/file_sys/control_metadata.h
@@ -62,7 +62,7 @@ enum class Language : u8 {
     Chinese = 14,
 };
 
-static std::array<std::string, 15> LANGUAGE_NAMES = {
+static constexpr std::array<const char*, 15> LANGUAGE_NAMES = {
     "AmericanEnglish", "BritishEnglish", "Japanese",
     "French",          "German",         "LatinAmericanSpanish",
     "Spanish",         "Italian",        "Dutch",
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp
index cc88a44b68..4a028250ba 100644
--- a/src/core/loader/deconstructed_rom_directory.cpp
+++ b/src/core/loader/deconstructed_rom_directory.cpp
@@ -25,7 +25,7 @@ AppLoader_DeconstructedRomDirectory::AppLoader_DeconstructedRomDirectory(FileSys
     // Icon
     FileSys::VirtualFile icon_file = nullptr;
     for (const auto& language : FileSys::LANGUAGE_NAMES) {
-        icon_file = dir->GetFile("icon_" + language + ".dat");
+        icon_file = dir->GetFile("icon_" + std::string(language) + ".dat");
         if (icon_file != nullptr) {
             icon_data = icon_file->ReadAllBytes();
             break;
diff --git a/src/yuzu/configuration/configure_gamelist.cpp b/src/yuzu/configuration/configure_gamelist.cpp
index 072b3f96fd..c81e716f98 100644
--- a/src/yuzu/configuration/configure_gamelist.cpp
+++ b/src/yuzu/configuration/configure_gamelist.cpp
@@ -12,9 +12,9 @@ ConfigureGameList::ConfigureGameList(QWidget* parent)
     : QWidget(parent), ui(new Ui::ConfigureGameList) {
     ui->setupUi(this);
 
-    static std::vector<std::pair<u32, std::string>> default_icon_sizes{
-        std::make_pair(0, "None"),        std::make_pair(24, "Small"),
-        std::make_pair(48, "Standard"),   std::make_pair(96, "Large"),
+    static const std::vector<std::pair<u32, std::string>> default_icon_sizes{
+        std::make_pair(0, "None"),        std::make_pair(32, "Small"),
+        std::make_pair(64, "Standard"),   std::make_pair(128, "Large"),
         std::make_pair(256, "Full Size"),
     };
 
@@ -25,7 +25,7 @@ ConfigureGameList::ConfigureGameList(QWidget* parent)
                                         size.first);
     }
 
-    static std::vector<std::string> row_text_names{
+    static const std::vector<std::string> row_text_names{
         "Filename",
         "Filetype",
         "Title ID",
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index 893c5f693c..481d91be58 100644
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -466,7 +466,7 @@ void GameListWorker::AddFstEntriesToGameList(const std::string& dir_path, unsign
 
                     FileSys::VirtualFile icon_file = nullptr;
                     for (const auto& language : FileSys::LANGUAGE_NAMES) {
-                        icon_file = control_dir->GetFile("icon_" + language + ".dat");
+                        icon_file = control_dir->GetFile("icon_" + std::string(language) + ".dat");
                         if (icon_file != nullptr) {
                             icon = icon_file->ReadAllBytes();
                             break;