diff --git a/src/Application/Core/Renderer.h b/src/Application/Core/Renderer.h
index 14106c14..69abde01 100644
--- a/src/Application/Core/Renderer.h
+++ b/src/Application/Core/Renderer.h
@@ -3,13 +3,12 @@
 
 #include <SDL2/SDL.h>
 
-#include "Icons.h"
-#include "Style.h"
+#include "Graphics/Icons.h"
+#include "Graphics/Style.h"
 #include "imgui/backends/imgui_impl_sdl.h"
 #include "imgui/backends/imgui_impl_sdlrenderer.h"
-#include "imgui/imgui.h"
-#include "imgui/imgui_internal.h"
-#include "imgui/misc/cpp/imgui_stdlib.h"
+#include <imgui/imgui.h>
+// #include "imgui/imgui_internal.h"
 
 namespace yaze {
 namespace Application {
diff --git a/src/Application/Editor/Editor.h b/src/Application/Editor/Editor.h
index b9bec3c7..65084f89 100644
--- a/src/Application/Editor/Editor.h
+++ b/src/Application/Editor/Editor.h
@@ -10,9 +10,9 @@
 #include <memory>
 
 #include "Core/Constants.h"
-#include "Core/Icons.h"
-#include "OverworldEditor.h"
 #include "Data/ROM.h"
+#include "Graphics/Icons.h"
+#include "OverworldEditor.h"
 
 namespace yaze {
 namespace Application {
diff --git a/src/Application/Editor/OverworldEditor.cc b/src/Application/Editor/OverworldEditor.cc
index 22c6c0a5..e06745e8 100644
--- a/src/Application/Editor/OverworldEditor.cc
+++ b/src/Application/Editor/OverworldEditor.cc
@@ -4,8 +4,8 @@
 
 #include <cmath>
 
-#include "Core/Icons.h"
 #include "Graphics/Bitmap.h"
+#include "Graphics/Icons.h"
 #include "Graphics/Tile.h"
 
 // first step would be to decompress all graphics data from the game
@@ -32,7 +32,7 @@ namespace Editor {
 void OverworldEditor::Update() {
   if (rom_.isLoaded()) {
     if (!doneLoaded) {
-      //overworld.Load(rom_);
+      // overworld.Load(rom_);
       doneLoaded = true;
     }
   }
@@ -266,7 +266,6 @@ void OverworldEditor::DrawOverworldCanvas() {
 void OverworldEditor::DrawTileSelector() {
   if (ImGui::BeginTabBar("##TabBar", ImGuiTabBarFlags_FittingPolicyScroll)) {
     if (ImGui::BeginTabItem("Tile8")) {
-
       ImGui::EndTabItem();
     }
     if (ImGui::BeginTabItem("Tile16")) {
diff --git a/src/Application/Editor/OverworldEditor.h b/src/Application/Editor/OverworldEditor.h
index 65736436..b71de1a3 100644
--- a/src/Application/Editor/OverworldEditor.h
+++ b/src/Application/Editor/OverworldEditor.h
@@ -3,7 +3,7 @@
 
 #include <imgui/imgui.h>
 
-#include "Core/Icons.h"
+#include "Graphics/Icons.h"
 #include "Data/OW/Overworld.h"
 #include "Graphics/Palette.h"
 #include "Graphics/Scene.h"
diff --git a/src/Application/Core/Icons.h b/src/Application/Graphics/Icons.h
similarity index 100%
rename from src/Application/Core/Icons.h
rename to src/Application/Graphics/Icons.h
diff --git a/src/Application/Core/Style.h b/src/Application/Graphics/Style.h
similarity index 100%
rename from src/Application/Core/Style.h
rename to src/Application/Graphics/Style.h