diff --git a/src/frontend-common/IconsFontAwesome5.h b/dep/imgui/include/IconsFontAwesome5.h
similarity index 100%
rename from src/frontend-common/IconsFontAwesome5.h
rename to dep/imgui/include/IconsFontAwesome5.h
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 0ed5647aa..fd61505e8 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -57,6 +57,10 @@ add_library(core
     host_interface.h
     host_interface_progress_callback.cpp
     host_interface_progress_callback.h
+    imgui_styles.cpp
+    imgui_styles.h  
+    imgui_fullscreen.cpp
+    imgui_fullscreen.h
     interrupt_controller.cpp
     interrupt_controller.h
     libcrypt_game_codes.cpp
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 47a4f0f04..8cc3cf525 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\dep\msvc\vsprops\Configurations.props" />
-
   <ItemGroup>
     <ClCompile Include="analog_controller.cpp" />
     <ClCompile Include="analog_joystick.cpp" />
@@ -50,6 +49,8 @@
     <ClCompile Include="host_display.cpp" />
     <ClCompile Include="host_interface.cpp" />
     <ClCompile Include="host_interface_progress_callback.cpp" />
+    <ClCompile Include="imgui_fullscreen.cpp" />
+    <ClCompile Include="imgui_styles.cpp" />
     <ClCompile Include="interrupt_controller.cpp" />
     <ClCompile Include="libcrypt_game_codes.cpp" />
     <ClCompile Include="mdec.cpp" />
@@ -117,6 +118,8 @@
     <ClInclude Include="host_display.h" />
     <ClInclude Include="host_interface.h" />
     <ClInclude Include="host_interface_progress_callback.h" />
+    <ClInclude Include="imgui_fullscreen.h" />
+    <ClInclude Include="imgui_styles.h" />
     <ClInclude Include="interrupt_controller.h" />
     <ClInclude Include="libcrypt_game_codes.h" />
     <ClInclude Include="mdec.h" />
@@ -143,20 +146,15 @@
     <ClInclude Include="timing_event.h" />
     <ClInclude Include="types.h" />
   </ItemGroup>
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{868B98C8-65A1-494B-8346-250A73A48C0A}</ProjectGuid>
   </PropertyGroup>
-
   <Import Project="..\..\dep\msvc\vsprops\StaticLibrary.props" />
-
   <Import Project="core.props" />
-
   <ItemDefinitionGroup>
     <ClCompile>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
     </ClCompile>
   </ItemDefinitionGroup>
-
   <Import Project="..\..\dep\msvc\vsprops\Targets.props" />
 </Project>
\ No newline at end of file
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
index 147d956ce..08139a22c 100644
--- a/src/core/core.vcxproj.filters
+++ b/src/core/core.vcxproj.filters
@@ -56,9 +56,10 @@
     <ClCompile Include="gpu_sw_backend.cpp" />
     <ClCompile Include="libcrypt_game_codes.cpp" />
     <ClCompile Include="texture_replacements.cpp" />
-    <ClCompile Include="gdb_protocol.h" />
     <ClCompile Include="multitap.cpp" />
     <ClCompile Include="gpu_hw_d3d12.cpp" />
+    <ClCompile Include="imgui_fullscreen.cpp" />
+    <ClCompile Include="imgui_styles.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="types.h" />
@@ -120,5 +121,8 @@
     <ClInclude Include="shader_cache_version.h" />
     <ClInclude Include="multitap.h" />
     <ClInclude Include="gpu_hw_d3d12.h" />
+    <ClInclude Include="gdb_protocol.h" />
+    <ClInclude Include="imgui_fullscreen.h" />
+    <ClInclude Include="imgui_styles.h" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/frontend-common/imgui_fullscreen.cpp b/src/core/imgui_fullscreen.cpp
similarity index 99%
rename from src/frontend-common/imgui_fullscreen.cpp
rename to src/core/imgui_fullscreen.cpp
index e0d46a5e7..26c7403ef 100644
--- a/src/frontend-common/imgui_fullscreen.cpp
+++ b/src/core/imgui_fullscreen.cpp
@@ -8,8 +8,8 @@
 #include "common/string.h"
 #include "common/string_util.h"
 #include "common/timer.h"
-#include "core/host_display.h"
-#include "core/host_interface.h"
+#include "host_display.h"
+#include "host_interface.h"
 #include "imgui_internal.h"
 #include "imgui_styles.h"
 #include <cmath>
diff --git a/src/frontend-common/imgui_fullscreen.h b/src/core/imgui_fullscreen.h
similarity index 100%
rename from src/frontend-common/imgui_fullscreen.h
rename to src/core/imgui_fullscreen.h
diff --git a/src/frontend-common/imgui_styles.cpp b/src/core/imgui_styles.cpp
similarity index 100%
rename from src/frontend-common/imgui_styles.cpp
rename to src/core/imgui_styles.cpp
diff --git a/src/frontend-common/imgui_styles.h b/src/core/imgui_styles.h
similarity index 100%
rename from src/frontend-common/imgui_styles.h
rename to src/core/imgui_styles.h
diff --git a/src/duckstation-nogui/nogui_host_interface.cpp b/src/duckstation-nogui/nogui_host_interface.cpp
index 403be7490..ce6219065 100644
--- a/src/duckstation-nogui/nogui_host_interface.cpp
+++ b/src/duckstation-nogui/nogui_host_interface.cpp
@@ -7,11 +7,11 @@
 #include "core/controller.h"
 #include "core/gpu.h"
 #include "core/host_display.h"
+#include "core/imgui_styles.h"
 #include "core/system.h"
 #include "frontend-common/controller_interface.h"
 #include "frontend-common/fullscreen_ui.h"
 #include "frontend-common/icon.h"
-#include "frontend-common/imgui_styles.h"
 #include "frontend-common/ini_settings_interface.h"
 #include "frontend-common/opengl_host_display.h"
 #include "frontend-common/vulkan_host_display.h"
diff --git a/src/duckstation-qt/qthostinterface.cpp b/src/duckstation-qt/qthostinterface.cpp
index e3f9ab24e..6320899cb 100644
--- a/src/duckstation-qt/qthostinterface.cpp
+++ b/src/duckstation-qt/qthostinterface.cpp
@@ -8,12 +8,12 @@
 #include "core/cheats.h"
 #include "core/controller.h"
 #include "core/gpu.h"
+#include "core/imgui_fullscreen.h"
+#include "core/imgui_styles.h"
 #include "core/memory_card.h"
 #include "core/system.h"
 #include "frontend-common/fullscreen_ui.h"
 #include "frontend-common/game_list.h"
-#include "frontend-common/imgui_fullscreen.h"
-#include "frontend-common/imgui_styles.h"
 #include "frontend-common/ini_settings_interface.h"
 #include "frontend-common/opengl_host_display.h"
 #include "frontend-common/sdl_audio_stream.h"
diff --git a/src/frontend-common/CMakeLists.txt b/src/frontend-common/CMakeLists.txt
index 5613c66d6..24d6ed657 100644
--- a/src/frontend-common/CMakeLists.txt
+++ b/src/frontend-common/CMakeLists.txt
@@ -23,14 +23,10 @@ add_library(frontend-common
   ini_settings_interface.h
   input_overlay_ui.cpp
   input_overlay_ui.h
-  imgui_fullscreen.cpp
-  imgui_fullscreen.h
   imgui_impl_opengl3.cpp
   imgui_impl_opengl3.h
   imgui_impl_vulkan.cpp
   imgui_impl_vulkan.h
-  imgui_styles.cpp
-  imgui_styles.h  
   opengl_host_display.cpp
   opengl_host_display.h
   postprocessing_chain.cpp
diff --git a/src/frontend-common/cheevos.cpp b/src/frontend-common/cheevos.cpp
index 6b0cb8691..e53a007e4 100644
--- a/src/frontend-common/cheevos.cpp
+++ b/src/frontend-common/cheevos.cpp
@@ -12,9 +12,9 @@
 #include "core/bus.h"
 #include "core/cpu_core.h"
 #include "core/host_display.h"
+#include "core/imgui_fullscreen.h"
 #include "core/system.h"
 #include "fullscreen_ui.h"
-#include "imgui_fullscreen.h"
 #include "rapidjson/document.h"
 #include "rc_url.h"
 #include "rcheevos.h"
diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp
index e66718d78..dd63c29d7 100644
--- a/src/frontend-common/common_host_interface.cpp
+++ b/src/frontend-common/common_host_interface.cpp
@@ -15,6 +15,8 @@
 #include "core/gpu.h"
 #include "core/gte.h"
 #include "core/host_display.h"
+#include "core/imgui_fullscreen.h"
+#include "core/imgui_styles.h"
 #include "core/mdec.h"
 #include "core/pgxp.h"
 #include "core/save_state_version.h"
@@ -27,8 +29,6 @@
 #include "game_list.h"
 #include "icon.h"
 #include "imgui.h"
-#include "imgui_fullscreen.h"
-#include "imgui_styles.h"
 #include "inhibit_screensaver.h"
 #include "ini_settings_interface.h"
 #include "input_overlay_ui.h"
diff --git a/src/frontend-common/frontend-common.vcxproj b/src/frontend-common/frontend-common.vcxproj
index 7095e5e2d..04ad3cd0d 100644
--- a/src/frontend-common/frontend-common.vcxproj
+++ b/src/frontend-common/frontend-common.vcxproj
@@ -18,12 +18,10 @@
     <ClCompile Include="game_list.cpp" />
     <ClCompile Include="game_settings.cpp" />
     <ClCompile Include="icon.cpp" />
-    <ClCompile Include="imgui_fullscreen.cpp" />
     <ClCompile Include="imgui_impl_dx11.cpp" />
     <ClCompile Include="imgui_impl_dx12.cpp" />
     <ClCompile Include="imgui_impl_opengl3.cpp" />
     <ClCompile Include="imgui_impl_vulkan.cpp" />
-    <ClCompile Include="imgui_styles.cpp" />
     <ClCompile Include="inhibit_screensaver.cpp" />
     <ClCompile Include="ini_settings_interface.cpp" />
     <ClCompile Include="input_overlay_ui.cpp" />
@@ -63,12 +61,10 @@
     <ClInclude Include="game_list.h" />
     <ClInclude Include="game_settings.h" />
     <ClInclude Include="icon.h" />
-    <ClInclude Include="imgui_fullscreen.h" />
     <ClInclude Include="imgui_impl_dx11.h" />
     <ClInclude Include="imgui_impl_dx12.h" />
     <ClInclude Include="imgui_impl_opengl3.h" />
     <ClInclude Include="imgui_impl_vulkan.h" />
-    <ClInclude Include="imgui_styles.h" />
     <ClInclude Include="inhibit_screensaver.h" />
     <ClInclude Include="ini_settings_interface.h" />
     <ClInclude Include="input_overlay_ui.h" />
diff --git a/src/frontend-common/frontend-common.vcxproj.filters b/src/frontend-common/frontend-common.vcxproj.filters
index 2e34d4e2f..b51d7ac4a 100644
--- a/src/frontend-common/frontend-common.vcxproj.filters
+++ b/src/frontend-common/frontend-common.vcxproj.filters
@@ -2,7 +2,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="icon.cpp" />
-    <ClCompile Include="imgui_styles.cpp" />
     <ClCompile Include="sdl_audio_stream.cpp" />
     <ClCompile Include="sdl_controller_interface.cpp" />
     <ClCompile Include="sdl_initializer.cpp" />
@@ -24,7 +23,6 @@
     <ClCompile Include="postprocessing_chain.cpp" />
     <ClCompile Include="cubeb_audio_stream.cpp" />
     <ClCompile Include="dinput_controller_interface.cpp" />
-    <ClCompile Include="imgui_fullscreen.cpp" />
     <ClCompile Include="fullscreen_ui.cpp" />
     <ClCompile Include="fullscreen_ui_progress_callback.cpp" />
     <ClCompile Include="cheevos.cpp" />
@@ -37,7 +35,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="icon.h" />
-    <ClInclude Include="imgui_styles.h" />
     <ClInclude Include="sdl_audio_stream.h" />
     <ClInclude Include="sdl_controller_interface.h" />
     <ClInclude Include="sdl_initializer.h" />
@@ -59,7 +56,6 @@
     <ClInclude Include="postprocessing_chain.h" />
     <ClInclude Include="cubeb_audio_stream.h" />
     <ClInclude Include="dinput_controller_interface.h" />
-    <ClInclude Include="imgui_fullscreen.h" />
     <ClInclude Include="fullscreen_ui.h" />
     <ClInclude Include="fullscreen_ui_progress_callback.h" />
     <ClInclude Include="cheevos.h" />
diff --git a/src/frontend-common/fullscreen_ui.cpp b/src/frontend-common/fullscreen_ui.cpp
index b79de8cb0..b4bd7b034 100644
--- a/src/frontend-common/fullscreen_ui.cpp
+++ b/src/frontend-common/fullscreen_ui.cpp
@@ -17,6 +17,8 @@
 #include "core/gpu.h"
 #include "core/host_display.h"
 #include "core/host_interface_progress_callback.h"
+#include "core/imgui_fullscreen.h"
+#include "core/imgui_styles.h"
 #include "core/resources.h"
 #include "core/settings.h"
 #include "core/system.h"
@@ -24,10 +26,8 @@
 #include "game_list.h"
 #include "icon.h"
 #include "imgui.h"
-#include "imgui_fullscreen.h"
 #include "imgui_internal.h"
 #include "imgui_stdlib.h"
-#include "imgui_styles.h"
 #include "scmversion/scmversion.h"
 #include <bitset>
 #include <thread>
diff --git a/src/frontend-common/fullscreen_ui_progress_callback.cpp b/src/frontend-common/fullscreen_ui_progress_callback.cpp
index a658dda83..4159d89a7 100644
--- a/src/frontend-common/fullscreen_ui_progress_callback.cpp
+++ b/src/frontend-common/fullscreen_ui_progress_callback.cpp
@@ -1,7 +1,7 @@
 #include "fullscreen_ui_progress_callback.h"
 #include "common/log.h"
 #include "core/host_interface.h"
-#include "imgui_fullscreen.h"
+#include "core/imgui_fullscreen.h"
 Log_SetChannel(ProgressCallback);
 
 namespace FullscreenUI {
diff --git a/src/frontend-common/input_overlay_ui.cpp b/src/frontend-common/input_overlay_ui.cpp
index a11ed19bf..0db3f9ba4 100644
--- a/src/frontend-common/input_overlay_ui.cpp
+++ b/src/frontend-common/input_overlay_ui.cpp
@@ -1,10 +1,10 @@
 #include "input_overlay_ui.h"
 #include "common_host_interface.h"
+#include "core/imgui_fullscreen.h"
 #include "core/pad.h"
 #include "core/settings.h"
 #include "core/system.h"
 #include "fullscreen_ui.h"
-#include "imgui_fullscreen.h"
 
 static CommonHostInterface* GetHostInterface()
 {