diff --git a/src/common/path_util.cpp b/src/common/path_util.cpp
index d3f842339..4e85e140e 100644
--- a/src/common/path_util.cpp
+++ b/src/common/path_util.cpp
@@ -130,6 +130,7 @@ static auto UserPaths = [] {
     create_path(PathType::HomeDir, user_dir / HOME_DIR);
     create_path(PathType::CacheDir, user_dir / CACHE_DIR);
     create_path(PathType::FontsDir, user_dir / FONTS_DIR);
+    create_path(PathType::HomeDir, user_dir / HOME_DIR);
 
     std::ofstream notice_file(user_dir / CUSTOM_TROPHY / "Notice.txt");
     if (notice_file.is_open()) {
diff --git a/src/common/path_util.h b/src/common/path_util.h
index e52a3b4a0..71e1bd931 100644
--- a/src/common/path_util.h
+++ b/src/common/path_util.h
@@ -27,6 +27,7 @@ enum class PathType {
     HomeDir,        // PS4 home directory
     CacheDir,       // Where pipeline and shader cache is stored.
     FontsDir,       // Where dumped system fonts are stored.
+    HomeDir,        // PS4 home directory
 };
 
 constexpr auto PORTABLE_DIR = "user";
@@ -48,6 +49,7 @@ constexpr auto CUSTOM_CONFIGS = "custom_configs";
 constexpr auto HOME_DIR = "home";
 constexpr auto CACHE_DIR = "cache";
 constexpr auto FONTS_DIR = "fonts";
+constexpr auto HOME_DIR = "home";
 
 // Filenames
 constexpr auto LOG_FILE = "shad_log.txt";
diff --git a/src/common/serdes.h b/src/common/serdes.h
index 02690e0c8..f91a0ace8 100644
--- a/src/common/serdes.h
+++ b/src/common/serdes.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
diff --git a/src/core/address_space.cpp b/src/core/address_space.cpp
index 980a238a6..ca3d52042 100644
--- a/src/core/address_space.cpp
+++ b/src/core/address_space.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <map>
diff --git a/src/core/devtools/widget/frame_graph.cpp b/src/core/devtools/widget/frame_graph.cpp
index 20f30e107..6d4452074 100644
--- a/src/core/devtools/widget/frame_graph.cpp
+++ b/src/core/devtools/widget/frame_graph.cpp
@@ -1,4 +1,4 @@
-//  SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
+//  SPDX-FileCopyrightText: Copyright 2025-2026 shadPS4 Emulator Project
 //  SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "frame_graph.h"
diff --git a/src/core/devtools/widget/module_list.h b/src/core/devtools/widget/module_list.h
index 25a05a335..4eed5444d 100644
--- a/src/core/devtools/widget/module_list.h
+++ b/src/core/devtools/widget/module_list.h
@@ -1,4 +1,4 @@
-//  SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+//  SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 //  SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
diff --git a/src/core/devtools/widget/shader_list.cpp b/src/core/devtools/widget/shader_list.cpp
index 04e942e75..243e2355f 100644
--- a/src/core/devtools/widget/shader_list.cpp
+++ b/src/core/devtools/widget/shader_list.cpp
@@ -1,4 +1,4 @@
-//  SPDX-FileCopyrightText: Copyright 2025-2026 shadPS4 Emulator Project
+//  SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 //  SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <fstream>
@@ -245,7 +245,7 @@ void ShaderList::Draw() {
     }
 
     if (!EmulatorSettings.IsShaderCollect()) {
-        DrawCenteredText("Enable 'shader_dump' in config to see shaders");
+        DrawCenteredText("Enable 'shader_collect' in config to see shaders");
         End();
         return;
     }
diff --git a/src/core/emulator_settings.cpp b/src/core/emulator_settings.cpp
index a51b047a9..c1c0342ea 100644
--- a/src/core/emulator_settings.cpp
+++ b/src/core/emulator_settings.cpp
@@ -584,27 +584,48 @@ bool EmulatorSettingsImpl::TransferSettings() {
         const toml::value& gui = og_data.at("GUI");
         auto& s = m_general;
 
-        // TODO
+        // Transfer install directories
+        try {
+            const auto install_dir_array =
+                toml::find_or<std::vector<std::string>>(gui, "installDirs", {});
+            std::vector<bool> install_dirs_enabled;
 
-        // const auto install_dir_array =
-        //     toml::find_or<std::vector<std::u8string>>(gui, "installDirs", {});
-        // try {
-        //     install_dirs_enabled = toml::find<std::vector<bool>>(gui, "installDirsEnabled");
-        // } catch (...) {
-        //     // If it does not exist, assume that all are enabled.
-        //     install_dirs_enabled.resize(install_dir_array.size(), true);
-        // }
-        // if (install_dirs_enabled.size() < install_dir_array.size()) {
-        //     install_dirs_enabled.resize(install_dir_array.size(), true);
-        // }
-        // settings_install_dirs.clear();
-        // for (size_t i = 0; i < install_dir_array.size(); i++) {
-        //     settings_install_dirs.push_back(
-        //         {std::filesystem::path{install_dir_array[i]}, install_dirs_enabled[i]});
-        // }
-        // save_data_path = toml::find_fs_path_or(gui, "saveDataPath", save_data_path);
-        // settings_addon_install_dir =
-        //     toml::find_fs_path_or(gui, "addonInstallDir", settings_addon_install_dir);
+            try {
+                install_dirs_enabled = toml::find<std::vector<bool>>(gui, "installDirsEnabled");
+            } catch (...) {
+                // If it does not exist, assume that all are enabled.
+                install_dirs_enabled.resize(install_dir_array.size(), true);
+            }
+
+            if (install_dirs_enabled.size() < install_dir_array.size()) {
+                install_dirs_enabled.resize(install_dir_array.size(), true);
+            }
+
+            std::vector<GameInstallDir> settings_install_dirs;
+            for (size_t i = 0; i < install_dir_array.size(); i++) {
+                settings_install_dirs.push_back(
+                    {std::filesystem::path{install_dir_array[i]}, install_dirs_enabled[i]});
+            }
+            s.install_dirs.value = settings_install_dirs;
+        } catch (const std::exception& e) {
+            LOG_WARNING(EmuSettings, "Failed to transfer install directories: {}", e.what());
+        }
+
+        // Transfer addon install directory
+        try {
+            std::string addon_install_dir_str;
+            if (gui.contains("addonInstallDir")) {
+                const auto& addon_value = gui.at("addonInstallDir");
+                if (addon_value.is_string()) {
+                    addon_install_dir_str = toml::get<std::string>(addon_value);
+                    if (!addon_install_dir_str.empty()) {
+                        s.addon_install_dir.value = std::filesystem::path{addon_install_dir_str};
+                    }
+                }
+            }
+        } catch (const std::exception& e) {
+            LOG_WARNING(EmuSettings, "Failed to transfer addon install directory: {}", e.what());
+        }
     }
 
     return true;
diff --git a/src/core/libraries/audio/audioout_backend.h b/src/core/libraries/audio/audioout_backend.h
index ce6e261ab..e71abfefb 100644
--- a/src/core/libraries/audio/audioout_backend.h
+++ b/src/core/libraries/audio/audioout_backend.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
diff --git a/src/core/libraries/audio3d/audio3d_openal.cpp b/src/core/libraries/audio3d/audio3d_openal.cpp
index f5085b333..53bbb8b24 100644
--- a/src/core/libraries/audio3d/audio3d_openal.cpp
+++ b/src/core/libraries/audio3d/audio3d_openal.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <algorithm>
diff --git a/src/core/libraries/network/net_ctl_obj.cpp b/src/core/libraries/network/net_ctl_obj.cpp
index 4f412c399..5eb6403c2 100644
--- a/src/core/libraries/network/net_ctl_obj.cpp
+++ b/src/core/libraries/network/net_ctl_obj.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <algorithm>
diff --git a/src/core/libraries/network/netctl.cpp b/src/core/libraries/network/netctl.cpp
index b2a76f92e..136d63810 100644
--- a/src/core/libraries/network/netctl.cpp
+++ b/src/core/libraries/network/netctl.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifdef WIN32
diff --git a/src/core/libraries/np/np_auth.cpp b/src/core/libraries/np/np_auth.cpp
index e9892b355..a9c2181b9 100644
--- a/src/core/libraries/np/np_auth.cpp
+++ b/src/core/libraries/np/np_auth.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <mutex>
diff --git a/src/core/libraries/np/np_matching2.cpp b/src/core/libraries/np/np_matching2.cpp
index dcd2a9c23..7a0af2dfa 100644
--- a/src/core/libraries/np/np_matching2.cpp
+++ b/src/core/libraries/np/np_matching2.cpp
@@ -5,6 +5,7 @@
 #include <mutex>
 
 #include "common/logging/log.h"
+#include "common/config.h"
 #include "core/emulator_settings.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
diff --git a/src/core/libraries/np/np_web_api2.cpp b/src/core/libraries/np/np_web_api2.cpp
index 0b292f6cc..a7c7ee3f3 100644
--- a/src/core/libraries/np/np_web_api2.cpp
+++ b/src/core/libraries/np/np_web_api2.cpp
@@ -115,10 +115,10 @@ s32 PS4_SYSV_ABI sceNpWebApi2IntInitialize2(const OrbisNpWebApi2IntInitialize2Ar
     if (args == nullptr || args->struct_size != sizeof(OrbisNpWebApi2IntInitialize2Args)) {
         return ORBIS_NP_WEBAPI2_ERROR_INVALID_ARGUMENT;
     }
-    LOG_ERROR(
-        Lib_NpWebApi2,
-        "(STUBBED) called, lib_http_ctx_id = {:#x}, pool_size = {:#x}, name = '{}', group = {:#x}",
-        args->lib_http_ctx_id, args->pool_size, args->name, args->push_config_group);
+    LOG_ERROR(Lib_NpWebApi2,
+              "(STUBBED) called, lib_http_ctx_id = {:#x}, pool_size = {:#x}, name = '{}', "
+              "group = {:#x}",
+              args->lib_http_ctx_id, args->pool_size, args->name, args->push_config_group);
     return ORBIS_OK;
 }
 
diff --git a/src/core/libraries/np/trophy_ui.cpp b/src/core/libraries/np/trophy_ui.cpp
index 1116d2b4b..a4fd21a33 100644
--- a/src/core/libraries/np/trophy_ui.cpp
+++ b/src/core/libraries/np/trophy_ui.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <chrono>
diff --git a/src/core/libraries/system/systemservice.cpp b/src/core/libraries/system/systemservice.cpp
index b9d0e5494..f03c7e7cb 100644
--- a/src/core/libraries/system/systemservice.cpp
+++ b/src/core/libraries/system/systemservice.cpp
@@ -1,8 +1,8 @@
-// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <cstdlib>
-#include "common/logging/log.h"
+#include "common/config.h"
 #include "common/singleton.h"
 #include "core/emulator_settings.h"
 #include "core/file_sys/fs.h"
diff --git a/src/core/libraries/usbd/usbd.cpp b/src/core/libraries/usbd/usbd.cpp
index 507aa9ce8..add16b619 100644
--- a/src/core/libraries/usbd/usbd.cpp
+++ b/src/core/libraries/usbd/usbd.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/logging/log.h"
@@ -10,6 +10,8 @@
 #include <fmt/format.h>
 #include <libusb.h>
 
+#include "core/emulator_settings.h"
+
 namespace Libraries::Usbd {
 
 s32 libusb_to_orbis_error(int retVal) {
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 596fe2ca8..a340c3643 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -1223,13 +1223,16 @@ s32 MemoryManager::SetDirectMemoryType(VAddr addr, u64 size, s32 memory_type) {
                 // Increment phys_handle
                 phys_handle++;
             }
-
-            // Check if VMA can be merged with adjacent areas after physical area modifications.
-            vma_handle = MergeAdjacent(vma_map, vma_handle);
         }
         current_addr += size_in_vma;
         remaining_size -= size_in_vma;
-        vma_handle++;
+
+        // Check if VMA can be merged with adjacent areas after modifications.
+        vma_handle = MergeAdjacent(vma_map, vma_handle);
+        if (vma_handle->second.base + vma_handle->second.size <= current_addr) {
+            // If we're now in the next VMA, then go to the next handle.
+            vma_handle++;
+        }
     }
 
     return ORBIS_OK;
@@ -1262,10 +1265,15 @@ void MemoryManager::NameVirtualRange(VAddr virtual_addr, u64 size, std::string_v
                 vma.name = name;
             }
         }
-        it = MergeAdjacent(vma_map, it);
         remaining_size -= size_in_vma;
         current_addr += size_in_vma;
-        it++;
+
+        // Check if VMA can be merged with adjacent areas after modifications.
+        it = MergeAdjacent(vma_map, it);
+        if (it->second.base + it->second.size <= current_addr) {
+            // If we're now in the next VMA, then go to the next handle.
+            it++;
+        }
     }
 }
 
diff --git a/src/core/module.h b/src/core/module.h
index 6d720e11f..8dde0f467 100644
--- a/src/core/module.h
+++ b/src/core/module.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
diff --git a/src/core/user_manager.h b/src/core/user_manager.h
index 89825bcf6..9273ef0cb 100644
--- a/src/core/user_manager.h
+++ b/src/core/user_manager.h
@@ -18,12 +18,11 @@ struct User {
 };
 
 struct Users {
-    int default_user_id = 1;
     std::vector<User> user{};
     std::string commit_hash{};
 };
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(User, user_id, user_color, user_name, player_index)
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Users, default_user_id, user, commit_hash)
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Users, user, commit_hash)
 
 using LoggedInUsers = std::array<User*, 4>;
 
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 1a384164d..034d30ed8 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -14,6 +14,7 @@
 #include "common/logging/backend.h"
 #include "common/logging/log.h"
 #include "common/thread.h"
+#include "core/emulator_settings.h"
 #include "core/ipc/ipc.h"
 #ifdef ENABLE_DISCORD_RPC
 #include "common/discord_rpc_handler.h"
diff --git a/src/imgui/renderer/imgui_core.cpp b/src/imgui/renderer/imgui_core.cpp
index 9d191a135..b52a68d22 100644
--- a/src/imgui/renderer/imgui_core.cpp
+++ b/src/imgui/renderer/imgui_core.cpp
@@ -218,6 +218,7 @@ void Render(const vk::CommandBuffer& cmdbuf, const vk::ImageView& image_view,
     if (draw_data->CmdListsCount == 0) {
         return;
     }
+
     if (EmulatorSettings.IsVkHostMarkersEnabled()) {
         cmdbuf.beginDebugUtilsLabelEXT(vk::DebugUtilsLabelEXT{
             .pLabelName = "ImGui Render",
diff --git a/src/imgui/renderer/imgui_impl_sdl3.cpp b/src/imgui/renderer/imgui_impl_sdl3.cpp
index 8e2860638..eea0357dd 100644
--- a/src/imgui/renderer/imgui_impl_sdl3.cpp
+++ b/src/imgui/renderer/imgui_impl_sdl3.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // Based on imgui_impl_sdl3.cpp from Dear ImGui repository
diff --git a/src/main.cpp b/src/main.cpp
index e9272f93a..125b0e106 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -9,6 +9,7 @@
 #include <CLI/CLI.hpp>
 #include <SDL3/SDL_messagebox.h>
 
+#include <core/emulator_settings.h>
 #include <core/emulator_state.h>
 #include "common/key_manager.h"
 #include "common/logging/backend.h"
@@ -18,7 +19,6 @@
 #include "core/file_sys/fs.h"
 #include "core/ipc/ipc.h"
 #include "emulator.h"
-
 #ifdef _WIN32
 #include <windows.h>
 #endif
@@ -43,6 +43,11 @@ int main(int argc, char* argv[]) {
     auto key_manager = KeyManager::GetInstance();
     key_manager->LoadFromFile();
 
+    // Load configurations
+    std::shared_ptr<EmulatorSettingsImpl> emu_settings = std::make_shared<EmulatorSettingsImpl>();
+    EmulatorSettingsImpl::SetInstance(emu_settings);
+    emu_settings->Load();
+
     CLI::App app{"shadPS4 Emulator CLI"};
 
     // ---- CLI state ----
diff --git a/src/video_core/buffer_cache/region_manager.h b/src/video_core/buffer_cache/region_manager.h
index 0bec330b1..229ee10ea 100644
--- a/src/video_core/buffer_cache/region_manager.h
+++ b/src/video_core/buffer_cache/region_manager.h
@@ -5,6 +5,7 @@
 
 #include "common/div_ceil.h"
 #include "common/logging/log.h"
+#include "core/emulator_settings.h"
 
 #ifdef __linux__
 #include "common/adaptive_mutex.h"
diff --git a/src/video_core/cache_storage.cpp b/src/video_core/cache_storage.cpp
index bc707b6d3..1899a8736 100644
--- a/src/video_core/cache_storage.cpp
+++ b/src/video_core/cache_storage.cpp
@@ -5,6 +5,7 @@
 #include "common/io_file.h"
 #include "common/polyfill_thread.h"
 #include "common/thread.h"
+#include "core/emulator_settings.h"
 
 #include "core/emulator_settings.h"
 #include "video_core/cache_storage.h"
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index e39464822..2666f05d3 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025-2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <ranges>
diff --git a/src/video_core/renderer_vulkan/vk_presenter.cpp b/src/video_core/renderer_vulkan/vk_presenter.cpp
index 3bf122cfc..c2a2a6621 100644
--- a/src/video_core/renderer_vulkan/vk_presenter.cpp
+++ b/src/video_core/renderer_vulkan/vk_presenter.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/debug.h"
@@ -596,7 +596,6 @@ void Presenter::Present(Frame* frame, bool is_reusing_frame) {
             TracyVkCollect(profiler_ctx, cmdbuf);
         }
     }
-
     if (EmulatorSettings.IsVkHostMarkersEnabled()) {
         cmdbuf.endDebugUtilsLabelEXT();
     }
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
index 7f0bd43e9..800941fe3 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/debug.h"
diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp
index c2b8694be..04f9d8504 100644
--- a/src/video_core/renderer_vulkan/vk_swapchain.cpp
+++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025-2026 shadPS4 Emulator Project
+// SPDX-FileCopyrightText: Copyright 2024-2026 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <algorithm>
diff --git a/src/video_core/texture_cache/image.cpp b/src/video_core/texture_cache/image.cpp
index e458f5cb3..44ddd55c6 100644
--- a/src/video_core/texture_cache/image.cpp
+++ b/src/video_core/texture_cache/image.cpp
@@ -247,13 +247,11 @@ Image::Barriers Image::GetBarriers(vk::ImageLayout dst_layout, vk::AccessFlags2
                 ASSERT(subres_idx < subresource_states.size());
                 auto& state = subresource_states[subres_idx];
 
-                if (state.layout != dst_layout || state.access_mask != dst_mask ||
-                    static_cast<bool>(dst_mask &
-                                      (vk::AccessFlagBits2::eTransferWrite |
-                                       vk::AccessFlagBits2::eShaderWrite |
-                                       vk::AccessFlagBits2::eColorAttachmentWrite |
-                                       vk::AccessFlagBits2::eDepthStencilAttachmentWrite |
-                                       vk::AccessFlagBits2::eMemoryWrite))) {
+                constexpr auto write_flags = vk::AccessFlagBits2::eTransferWrite |
+                                             vk::AccessFlagBits2::eShaderWrite |
+                                             vk::AccessFlagBits2::eMemoryWrite;
+                const bool is_write = static_cast<bool>(state.access_mask & write_flags);
+                if (state.layout != dst_layout || state.access_mask != dst_mask || is_write) {
                     barriers.emplace_back(vk::ImageMemoryBarrier2{
                         .srcStageMask = state.pl_stage,
                         .srcAccessMask = state.access_mask,
@@ -283,11 +281,10 @@ Image::Barriers Image::GetBarriers(vk::ImageLayout dst_layout, vk::AccessFlags2
             subresource_states.clear();
         }
     } else { // Full resource transition
-        constexpr auto write_flags =
-            vk::AccessFlagBits2::eTransferWrite | vk::AccessFlagBits2::eShaderWrite |
-            vk::AccessFlagBits2::eColorAttachmentWrite |
-            vk::AccessFlagBits2::eDepthStencilAttachmentWrite | vk::AccessFlagBits2::eMemoryWrite;
-        const bool is_write = static_cast<bool>(dst_mask & write_flags);
+        constexpr auto write_flags = vk::AccessFlagBits2::eTransferWrite |
+                                     vk::AccessFlagBits2::eShaderWrite |
+                                     vk::AccessFlagBits2::eMemoryWrite;
+        const bool is_write = static_cast<bool>(last_state.access_mask & write_flags);
         if (last_state.layout == dst_layout && last_state.access_mask == dst_mask && !is_write) {
             return {};
         }
@@ -385,6 +382,8 @@ void Image::Upload(std::span<const vk::BufferImageCopy> upload_copies, vk::Buffe
         .bufferMemoryBarrierCount = 1,
         .pBufferMemoryBarriers = &post_barrier,
     });
+    Transit(vk::ImageLayout::eGeneral,
+            vk::AccessFlagBits2::eShaderRead | vk::AccessFlagBits2::eTransferRead, {});
     flags &= ~ImageFlagBits::Dirty;
 }
 
@@ -655,8 +654,6 @@ void Image::CopyImageWithBuffer(Image& src_image, vk::Buffer buffer, u64 offset)
 
     cmdbuf.copyBufferToImage(buffer, GetImage(), vk::ImageLayout::eTransferDstOptimal,
                              buffer_copies);
-
-    // Match CopyImage: transition to general so shaders can sample the result.
     Transit(vk::ImageLayout::eGeneral,
             vk::AccessFlagBits2::eShaderRead | vk::AccessFlagBits2::eTransferRead, {});
 }
@@ -698,6 +695,8 @@ void Image::CopyMip(Image& src_image, u32 mip, u32 slice) {
     const auto cmdbuf = scheduler->CommandBuffer();
     cmdbuf.copyImage(src_image.GetImage(), src_image.backing->state.layout, GetImage(),
                      backing->state.layout, image_copy);
+    Transit(vk::ImageLayout::eGeneral,
+            vk::AccessFlagBits2::eShaderRead | vk::AccessFlagBits2::eTransferRead, {});
 }
 
 void Image::Resolve(Image& src_image, const VideoCore::SubresourceRange& mrt0_range,