diff --git a/qt_ui/main.py b/qt_ui/main.py
index 09b33d59..1d38876e 100644
--- a/qt_ui/main.py
+++ b/qt_ui/main.py
@@ -1,8 +1,6 @@
 from userdata import logging_config
 
 # Logging setup
-from userdata.liberation_theme import get_theme_file
-
 VERSION_STRING = "2.0RC7"
 logging_config.init_logging(VERSION_STRING)
 
@@ -28,7 +26,7 @@ if __name__ == "__main__":
 
     liberation_theme.init();
     css = ""
-    with open("./resources/stylesheets/"+get_theme_file()) as stylesheet:
+    with open("./resources/stylesheets/"+liberation_theme.get_theme_file()) as stylesheet:
         app.setStyleSheet(stylesheet.read())
 
     # Inject custom payload in pydcs framework
diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py
index 33fbbb71..8cd14d26 100644
--- a/qt_ui/uiconstants.py
+++ b/qt_ui/uiconstants.py
@@ -6,6 +6,7 @@ from PySide2.QtGui import QColor, QFont, QPixmap
 
 from game.event import UnitsDeliveryEvent, FrontlineAttackEvent
 from theater.theatergroundobject import CATEGORY_MAP
+from userdata.liberation_theme import get_theme_icons
 
 URLS : Dict[str, str] = {
     "Manual": "https://github.com/khopa/dcs_liberation/wiki",
@@ -64,9 +65,9 @@ ICONS: Dict[str, QPixmap] = {}
 
 def load_icons():
 
-    ICONS["New"] = QPixmap("./resources/ui/misc/new.png")
-    ICONS["Open"] = QPixmap("./resources/ui/misc/open.png")
-    ICONS["Save"] = QPixmap("./resources/ui/misc/save.png")
+    ICONS["New"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/new.png")
+    ICONS["Open"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/open.png")
+    ICONS["Save"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/save.png")
 
     ICONS["Terrain_Caucasus"] = QPixmap("./resources/ui/terrain_caucasus.gif")
     ICONS["Terrain_Persian_Gulf"] = QPixmap("./resources/ui/terrain_pg.gif")
@@ -79,12 +80,12 @@ def load_icons():
     ICONS["Dusk"] = QPixmap("./resources/ui/daytime/dusk.png")
     ICONS["Night"] = QPixmap("./resources/ui/daytime/night.png")
 
-    ICONS["Money"] = QPixmap("./resources/ui/misc/money_icon.png")
-    ICONS["PassTurn"] = QPixmap("./resources/ui/misc/hourglass.png")
-    ICONS["Proceed"] = QPixmap("./resources/ui/misc/proceed.png")
-    ICONS["Settings"] = QPixmap("./resources/ui/misc/settings.png")
-    ICONS["Statistics"] = QPixmap("./resources/ui/misc/statistics.png")
-    ICONS["Ordnance"] = QPixmap("./resources/ui/misc/ordnance_icon.png")
+    ICONS["Money"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/money_icon.png")
+    ICONS["PassTurn"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/hourglass.png")
+    ICONS["Proceed"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/proceed.png")
+    ICONS["Settings"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/settings.png")
+    ICONS["Statistics"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/statistics.png")
+    ICONS["Ordnance"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/ordnance_icon.png")
 
     ICONS["target"] = QPixmap("./resources/ui/ground_assets/target.png")
     ICONS["cleared"] = QPixmap("./resources/ui/ground_assets/cleared.png")
diff --git a/resources/ui/misc/icons-dark/cheat.png b/resources/ui/misc/dark/cheat.png
similarity index 100%
rename from resources/ui/misc/icons-dark/cheat.png
rename to resources/ui/misc/dark/cheat.png
diff --git a/resources/ui/misc/icons-dark/generator.png b/resources/ui/misc/dark/generator.png
similarity index 100%
rename from resources/ui/misc/icons-dark/generator.png
rename to resources/ui/misc/dark/generator.png
diff --git a/resources/ui/misc/icons-dark/hourglass.png b/resources/ui/misc/dark/hourglass.png
similarity index 100%
rename from resources/ui/misc/icons-dark/hourglass.png
rename to resources/ui/misc/dark/hourglass.png
diff --git a/resources/ui/misc/icons-dark/missile.png b/resources/ui/misc/dark/missile.png
similarity index 100%
rename from resources/ui/misc/icons-dark/missile.png
rename to resources/ui/misc/dark/missile.png
diff --git a/resources/ui/misc/icons-dark/money_icon.png b/resources/ui/misc/dark/money_icon.png
similarity index 100%
rename from resources/ui/misc/icons-dark/money_icon.png
rename to resources/ui/misc/dark/money_icon.png
diff --git a/resources/ui/misc/icons-dark/new.png b/resources/ui/misc/dark/new.png
similarity index 100%
rename from resources/ui/misc/icons-dark/new.png
rename to resources/ui/misc/dark/new.png
diff --git a/resources/ui/misc/icons-dark/open.png b/resources/ui/misc/dark/open.png
similarity index 100%
rename from resources/ui/misc/icons-dark/open.png
rename to resources/ui/misc/dark/open.png
diff --git a/resources/ui/misc/icons-dark/ordnance_icon.png b/resources/ui/misc/dark/ordnance_icon.png
similarity index 100%
rename from resources/ui/misc/icons-dark/ordnance_icon.png
rename to resources/ui/misc/dark/ordnance_icon.png
diff --git a/resources/ui/misc/icons-dark/proceed.png b/resources/ui/misc/dark/proceed.png
similarity index 100%
rename from resources/ui/misc/icons-dark/proceed.png
rename to resources/ui/misc/dark/proceed.png
diff --git a/resources/ui/misc/icons-dark/save.png b/resources/ui/misc/dark/save.png
similarity index 100%
rename from resources/ui/misc/icons-dark/save.png
rename to resources/ui/misc/dark/save.png
diff --git a/resources/ui/misc/icons-dark/settings.png b/resources/ui/misc/dark/settings.png
similarity index 100%
rename from resources/ui/misc/icons-dark/settings.png
rename to resources/ui/misc/dark/settings.png
diff --git a/resources/ui/misc/icons-dark/statistics.png b/resources/ui/misc/dark/statistics.png
similarity index 100%
rename from resources/ui/misc/icons-dark/statistics.png
rename to resources/ui/misc/dark/statistics.png
diff --git a/resources/ui/misc/icons-light/cheat.png b/resources/ui/misc/light/cheat.png
similarity index 100%
rename from resources/ui/misc/icons-light/cheat.png
rename to resources/ui/misc/light/cheat.png
diff --git a/resources/ui/misc/icons-light/generator.png b/resources/ui/misc/light/generator.png
similarity index 100%
rename from resources/ui/misc/icons-light/generator.png
rename to resources/ui/misc/light/generator.png
diff --git a/resources/ui/misc/icons-light/hourglass.png b/resources/ui/misc/light/hourglass.png
similarity index 100%
rename from resources/ui/misc/icons-light/hourglass.png
rename to resources/ui/misc/light/hourglass.png
diff --git a/resources/ui/misc/icons-light/missile.png b/resources/ui/misc/light/missile.png
similarity index 100%
rename from resources/ui/misc/icons-light/missile.png
rename to resources/ui/misc/light/missile.png
diff --git a/resources/ui/misc/icons-light/money_icon.png b/resources/ui/misc/light/money_icon.png
similarity index 100%
rename from resources/ui/misc/icons-light/money_icon.png
rename to resources/ui/misc/light/money_icon.png
diff --git a/resources/ui/misc/icons-light/new.png b/resources/ui/misc/light/new.png
similarity index 100%
rename from resources/ui/misc/icons-light/new.png
rename to resources/ui/misc/light/new.png
diff --git a/resources/ui/misc/icons-light/open.png b/resources/ui/misc/light/open.png
similarity index 100%
rename from resources/ui/misc/icons-light/open.png
rename to resources/ui/misc/light/open.png
diff --git a/resources/ui/misc/icons-light/ordnance_icon.png b/resources/ui/misc/light/ordnance_icon.png
similarity index 100%
rename from resources/ui/misc/icons-light/ordnance_icon.png
rename to resources/ui/misc/light/ordnance_icon.png
diff --git a/resources/ui/misc/icons-light/proceed.png b/resources/ui/misc/light/proceed.png
similarity index 100%
rename from resources/ui/misc/icons-light/proceed.png
rename to resources/ui/misc/light/proceed.png
diff --git a/resources/ui/misc/icons-light/save.png b/resources/ui/misc/light/save.png
similarity index 100%
rename from resources/ui/misc/icons-light/save.png
rename to resources/ui/misc/light/save.png
diff --git a/resources/ui/misc/icons-light/settings.png b/resources/ui/misc/light/settings.png
similarity index 100%
rename from resources/ui/misc/icons-light/settings.png
rename to resources/ui/misc/light/settings.png
diff --git a/resources/ui/misc/icons-light/statistics.png b/resources/ui/misc/light/statistics.png
similarity index 100%
rename from resources/ui/misc/icons-light/statistics.png
rename to resources/ui/misc/light/statistics.png
diff --git a/resources/ui/misc/icons-medium/cheat.png b/resources/ui/misc/medium/cheat.png
similarity index 100%
rename from resources/ui/misc/icons-medium/cheat.png
rename to resources/ui/misc/medium/cheat.png
diff --git a/resources/ui/misc/icons-medium/generator.png b/resources/ui/misc/medium/generator.png
similarity index 100%
rename from resources/ui/misc/icons-medium/generator.png
rename to resources/ui/misc/medium/generator.png
diff --git a/resources/ui/misc/icons-medium/hourglass.png b/resources/ui/misc/medium/hourglass.png
similarity index 100%
rename from resources/ui/misc/icons-medium/hourglass.png
rename to resources/ui/misc/medium/hourglass.png
diff --git a/resources/ui/misc/icons-medium/missile.png b/resources/ui/misc/medium/missile.png
similarity index 100%
rename from resources/ui/misc/icons-medium/missile.png
rename to resources/ui/misc/medium/missile.png
diff --git a/resources/ui/misc/icons-medium/money_icon.png b/resources/ui/misc/medium/money_icon.png
similarity index 100%
rename from resources/ui/misc/icons-medium/money_icon.png
rename to resources/ui/misc/medium/money_icon.png
diff --git a/resources/ui/misc/icons-medium/new.png b/resources/ui/misc/medium/new.png
similarity index 100%
rename from resources/ui/misc/icons-medium/new.png
rename to resources/ui/misc/medium/new.png
diff --git a/resources/ui/misc/icons-medium/open.png b/resources/ui/misc/medium/open.png
similarity index 100%
rename from resources/ui/misc/icons-medium/open.png
rename to resources/ui/misc/medium/open.png
diff --git a/resources/ui/misc/icons-medium/ordnance_icon.png b/resources/ui/misc/medium/ordnance_icon.png
similarity index 100%
rename from resources/ui/misc/icons-medium/ordnance_icon.png
rename to resources/ui/misc/medium/ordnance_icon.png
diff --git a/resources/ui/misc/icons-medium/proceed.png b/resources/ui/misc/medium/proceed.png
similarity index 100%
rename from resources/ui/misc/icons-medium/proceed.png
rename to resources/ui/misc/medium/proceed.png
diff --git a/resources/ui/misc/icons-medium/save.png b/resources/ui/misc/medium/save.png
similarity index 100%
rename from resources/ui/misc/icons-medium/save.png
rename to resources/ui/misc/medium/save.png
diff --git a/resources/ui/misc/icons-medium/settings.png b/resources/ui/misc/medium/settings.png
similarity index 100%
rename from resources/ui/misc/icons-medium/settings.png
rename to resources/ui/misc/medium/settings.png
diff --git a/resources/ui/misc/icons-medium/statistics.png b/resources/ui/misc/medium/statistics.png
similarity index 100%
rename from resources/ui/misc/icons-medium/statistics.png
rename to resources/ui/misc/medium/statistics.png
diff --git a/userdata/liberation_theme.py b/userdata/liberation_theme.py
index 3bbfc317..f90d1a9f 100644
--- a/userdata/liberation_theme.py
+++ b/userdata/liberation_theme.py
@@ -67,8 +67,8 @@ def set_theme_icons():
 
 
 def get_theme_icons():
-    global __theme_icons
-    return str(__theme_icons)
+    theme_icons = CONST.THEMES[get_theme_index()]['themeIcons']
+    return str(theme_icons)
 
 
 # get or set theme from json file