diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py
index 9afdb458..4efeb01f 100644
--- a/qt_ui/uiconstants.py
+++ b/qt_ui/uiconstants.py
@@ -56,10 +56,18 @@ def load_icons():
 
     ICONS["Hangar"] = QPixmap("./resources/ui/misc/hangar.png")
 
-    ICONS["Dawn"] = QPixmap("./resources/ui/conditions/timeofday/dawn.png")
-    ICONS["Day"] = QPixmap("./resources/ui/conditions/timeofday/day.png")
-    ICONS["Dusk"] = QPixmap("./resources/ui/conditions/timeofday/dusk.png")
-    ICONS["Night"] = QPixmap("./resources/ui/conditions/timeofday/night.png")
+    ICONS["Dawn"] = QPixmap(
+        "./resources/ui/conditions/" + get_theme_icons() + "/timeofday/dawn.png"
+    )
+    ICONS["Day"] = QPixmap(
+        "./resources/ui/conditions/" + get_theme_icons() + "/timeofday/day.png"
+    )
+    ICONS["Dusk"] = QPixmap(
+        "./resources/ui/conditions/" + get_theme_icons() + "/timeofday/dusk.png"
+    )
+    ICONS["Night"] = QPixmap(
+        "./resources/ui/conditions/" + get_theme_icons() + "/timeofday/night.png"
+    )
 
     ICONS["Money"] = QPixmap(
         "./resources/ui/misc/" + get_theme_icons() + "/money_icon.png"
@@ -109,46 +117,64 @@ def load_icons():
     """
     Weather Icons
     """
-    ICONS["Weather_winds"] = QPixmap("./resources/ui/conditions/weather/winds.png")
+    ICONS["Weather_winds"] = QPixmap(
+        "./resources/ui/conditions/" + get_theme_icons() + "/weather/winds.png"
+    )
     ICONS["Weather_day-clear"] = QPixmap(
-        "./resources/ui/conditions/weather/day-clear.png"
+        "./resources/ui/conditions/" + get_theme_icons() + "/weather/day-clear.png"
     )
     ICONS["Weather_day-cloudy-fog"] = QPixmap(
-        "./resources/ui/conditions/weather/day-cloudy-fog.png"
+        "./resources/ui/conditions/" + get_theme_icons() + "/weather/day-cloudy-fog.png"
+    )
+    ICONS["Weather_day-fog"] = QPixmap(
+        "./resources/ui/conditions/" + get_theme_icons() + "/weather/day-fog.png"
     )
-    ICONS["Weather_day-fog"] = QPixmap("./resources/ui/conditions/weather/day-fog.png")
     ICONS["Weather_day-partly-cloudy"] = QPixmap(
-        "./resources/ui/conditions/weather/day-partly-cloudy.png"
+        "./resources/ui/conditions/"
+        + get_theme_icons()
+        + "/weather/day-partly-cloudy.png"
     )
     ICONS["Weather_day-rain"] = QPixmap(
-        "./resources/ui/conditions/weather/day-rain.png"
+        "./resources/ui/conditions/" + get_theme_icons() + "/weather/day-rain.png"
     )
     ICONS["Weather_day-thunderstorm"] = QPixmap(
-        "./resources/ui/conditions/weather/day-thunderstorm.png"
+        "./resources/ui/conditions/"
+        + get_theme_icons()
+        + "/weather/day-thunderstorm.png"
     )
     ICONS["Weather_day-totally-cloud"] = QPixmap(
-        "./resources/ui/conditions/weather/day-totally-cloud.png"
+        "./resources/ui/conditions/"
+        + get_theme_icons()
+        + "/weather/day-totally-cloud.png"
     )
     ICONS["Weather_night-clear"] = QPixmap(
-        "./resources/ui/conditions/weather/night-clear.png"
+        "./resources/ui/conditions/" + get_theme_icons() + "/weather/night-clear.png"
     )
     ICONS["Weather_night-cloudy-fog"] = QPixmap(
-        "./resources/ui/conditions/weather/night-cloudy-fog.png"
+        "./resources/ui/conditions/"
+        + get_theme_icons()
+        + "/weather/night-cloudy-fog.png"
     )
     ICONS["Weather_night-fog"] = QPixmap(
-        "./resources/ui/conditions/weather/night-fog.png"
+        "./resources/ui/conditions/" + get_theme_icons() + "/weather/night-fog.png"
     )
     ICONS["Weather_night-partly-cloudy"] = QPixmap(
-        "./resources/ui/conditions/weather/night-partly-cloudy.png"
+        "./resources/ui/conditions/"
+        + get_theme_icons()
+        + "/weather/night-partly-cloudy.png"
     )
     ICONS["Weather_night-rain"] = QPixmap(
-        "./resources/ui/conditions/weather/night-rain.png"
+        "./resources/ui/conditions/" + get_theme_icons() + "/weather/night-rain.png"
     )
     ICONS["Weather_night-thunderstorm"] = QPixmap(
-        "./resources/ui/conditions/weather/night-thunderstorm.png"
+        "./resources/ui/conditions/"
+        + get_theme_icons()
+        + "/weather/night-thunderstorm.png"
     )
     ICONS["Weather_night-totally-cloud"] = QPixmap(
-        "./resources/ui/conditions/weather/night-totally-cloud.png"
+        "./resources/ui/conditions/"
+        + get_theme_icons()
+        + "/weather/night-totally-cloud.png"
     )
 
     ICONS["heading"] = QPixmap("./resources/ui/misc/heading.png")
diff --git a/resources/ui/conditions/timeofday/dawn.png b/resources/ui/conditions/light/timeofday/dawn.png
similarity index 100%
rename from resources/ui/conditions/timeofday/dawn.png
rename to resources/ui/conditions/light/timeofday/dawn.png
diff --git a/resources/ui/conditions/timeofday/day.png b/resources/ui/conditions/light/timeofday/day.png
similarity index 100%
rename from resources/ui/conditions/timeofday/day.png
rename to resources/ui/conditions/light/timeofday/day.png
diff --git a/resources/ui/conditions/timeofday/dusk.png b/resources/ui/conditions/light/timeofday/dusk.png
similarity index 100%
rename from resources/ui/conditions/timeofday/dusk.png
rename to resources/ui/conditions/light/timeofday/dusk.png
diff --git a/resources/ui/conditions/timeofday/night.png b/resources/ui/conditions/light/timeofday/night.png
similarity index 100%
rename from resources/ui/conditions/timeofday/night.png
rename to resources/ui/conditions/light/timeofday/night.png
diff --git a/resources/ui/conditions/weather/day-clear.png b/resources/ui/conditions/light/weather/day-clear.png
similarity index 100%
rename from resources/ui/conditions/weather/day-clear.png
rename to resources/ui/conditions/light/weather/day-clear.png
diff --git a/resources/ui/conditions/weather/day-cloudy-fog.png b/resources/ui/conditions/light/weather/day-cloudy-fog.png
similarity index 100%
rename from resources/ui/conditions/weather/day-cloudy-fog.png
rename to resources/ui/conditions/light/weather/day-cloudy-fog.png
diff --git a/resources/ui/conditions/weather/day-fog.png b/resources/ui/conditions/light/weather/day-fog.png
similarity index 100%
rename from resources/ui/conditions/weather/day-fog.png
rename to resources/ui/conditions/light/weather/day-fog.png
diff --git a/resources/ui/conditions/weather/day-partly-cloudy.png b/resources/ui/conditions/light/weather/day-partly-cloudy.png
similarity index 100%
rename from resources/ui/conditions/weather/day-partly-cloudy.png
rename to resources/ui/conditions/light/weather/day-partly-cloudy.png
diff --git a/resources/ui/conditions/weather/day-rain.png b/resources/ui/conditions/light/weather/day-rain.png
similarity index 100%
rename from resources/ui/conditions/weather/day-rain.png
rename to resources/ui/conditions/light/weather/day-rain.png
diff --git a/resources/ui/conditions/weather/day-thunderstorm.png b/resources/ui/conditions/light/weather/day-thunderstorm.png
similarity index 100%
rename from resources/ui/conditions/weather/day-thunderstorm.png
rename to resources/ui/conditions/light/weather/day-thunderstorm.png
diff --git a/resources/ui/conditions/weather/day-totally-cloud.png b/resources/ui/conditions/light/weather/day-totally-cloud.png
similarity index 100%
rename from resources/ui/conditions/weather/day-totally-cloud.png
rename to resources/ui/conditions/light/weather/day-totally-cloud.png
diff --git a/resources/ui/conditions/weather/night-clear.png b/resources/ui/conditions/light/weather/night-clear.png
similarity index 100%
rename from resources/ui/conditions/weather/night-clear.png
rename to resources/ui/conditions/light/weather/night-clear.png
diff --git a/resources/ui/conditions/weather/night-cloudy-fog.png b/resources/ui/conditions/light/weather/night-cloudy-fog.png
similarity index 100%
rename from resources/ui/conditions/weather/night-cloudy-fog.png
rename to resources/ui/conditions/light/weather/night-cloudy-fog.png
diff --git a/resources/ui/conditions/weather/night-fog.png b/resources/ui/conditions/light/weather/night-fog.png
similarity index 100%
rename from resources/ui/conditions/weather/night-fog.png
rename to resources/ui/conditions/light/weather/night-fog.png
diff --git a/resources/ui/conditions/weather/night-partly-cloudy.png b/resources/ui/conditions/light/weather/night-partly-cloudy.png
similarity index 100%
rename from resources/ui/conditions/weather/night-partly-cloudy.png
rename to resources/ui/conditions/light/weather/night-partly-cloudy.png
diff --git a/resources/ui/conditions/weather/night-rain.png b/resources/ui/conditions/light/weather/night-rain.png
similarity index 100%
rename from resources/ui/conditions/weather/night-rain.png
rename to resources/ui/conditions/light/weather/night-rain.png
diff --git a/resources/ui/conditions/weather/night-thundersotrm.png b/resources/ui/conditions/light/weather/night-thundersotrm.png
similarity index 100%
rename from resources/ui/conditions/weather/night-thundersotrm.png
rename to resources/ui/conditions/light/weather/night-thundersotrm.png
diff --git a/resources/ui/conditions/weather/night-totally-cloud.png b/resources/ui/conditions/light/weather/night-totally-cloud.png
similarity index 100%
rename from resources/ui/conditions/weather/night-totally-cloud.png
rename to resources/ui/conditions/light/weather/night-totally-cloud.png
diff --git a/resources/ui/conditions/weather/winds.png b/resources/ui/conditions/light/weather/winds.png
similarity index 100%
rename from resources/ui/conditions/weather/winds.png
rename to resources/ui/conditions/light/weather/winds.png
diff --git a/resources/ui/conditions/medium/timeofday/dawn.png b/resources/ui/conditions/medium/timeofday/dawn.png
new file mode 100644
index 00000000..f492b778
Binary files /dev/null and b/resources/ui/conditions/medium/timeofday/dawn.png differ
diff --git a/resources/ui/conditions/medium/timeofday/day.png b/resources/ui/conditions/medium/timeofday/day.png
new file mode 100644
index 00000000..350f98cd
Binary files /dev/null and b/resources/ui/conditions/medium/timeofday/day.png differ
diff --git a/resources/ui/conditions/medium/timeofday/dusk.png b/resources/ui/conditions/medium/timeofday/dusk.png
new file mode 100644
index 00000000..73d4dd1d
Binary files /dev/null and b/resources/ui/conditions/medium/timeofday/dusk.png differ
diff --git a/resources/ui/conditions/medium/timeofday/night.png b/resources/ui/conditions/medium/timeofday/night.png
new file mode 100644
index 00000000..3401bf7f
Binary files /dev/null and b/resources/ui/conditions/medium/timeofday/night.png differ
diff --git a/resources/ui/conditions/medium/weather/day-clear.png b/resources/ui/conditions/medium/weather/day-clear.png
new file mode 100644
index 00000000..128cf9f0
Binary files /dev/null and b/resources/ui/conditions/medium/weather/day-clear.png differ
diff --git a/resources/ui/conditions/medium/weather/day-cloudy-fog.png b/resources/ui/conditions/medium/weather/day-cloudy-fog.png
new file mode 100644
index 00000000..210cfa4c
Binary files /dev/null and b/resources/ui/conditions/medium/weather/day-cloudy-fog.png differ
diff --git a/resources/ui/conditions/medium/weather/day-fog.png b/resources/ui/conditions/medium/weather/day-fog.png
new file mode 100644
index 00000000..8053fa58
Binary files /dev/null and b/resources/ui/conditions/medium/weather/day-fog.png differ
diff --git a/resources/ui/conditions/medium/weather/day-partly-cloudy.png b/resources/ui/conditions/medium/weather/day-partly-cloudy.png
new file mode 100644
index 00000000..4f270a3f
Binary files /dev/null and b/resources/ui/conditions/medium/weather/day-partly-cloudy.png differ
diff --git a/resources/ui/conditions/medium/weather/day-rain.png b/resources/ui/conditions/medium/weather/day-rain.png
new file mode 100644
index 00000000..1984bb6d
Binary files /dev/null and b/resources/ui/conditions/medium/weather/day-rain.png differ
diff --git a/resources/ui/conditions/medium/weather/day-thunderstorm.png b/resources/ui/conditions/medium/weather/day-thunderstorm.png
new file mode 100644
index 00000000..13627e46
Binary files /dev/null and b/resources/ui/conditions/medium/weather/day-thunderstorm.png differ
diff --git a/resources/ui/conditions/medium/weather/day-totally-cloud.png b/resources/ui/conditions/medium/weather/day-totally-cloud.png
new file mode 100644
index 00000000..fe042f5c
Binary files /dev/null and b/resources/ui/conditions/medium/weather/day-totally-cloud.png differ
diff --git a/resources/ui/conditions/medium/weather/night-clear.png b/resources/ui/conditions/medium/weather/night-clear.png
new file mode 100644
index 00000000..a657f6f0
Binary files /dev/null and b/resources/ui/conditions/medium/weather/night-clear.png differ
diff --git a/resources/ui/conditions/medium/weather/night-cloudy-fog.png b/resources/ui/conditions/medium/weather/night-cloudy-fog.png
new file mode 100644
index 00000000..79a7058d
Binary files /dev/null and b/resources/ui/conditions/medium/weather/night-cloudy-fog.png differ
diff --git a/resources/ui/conditions/medium/weather/night-fog.png b/resources/ui/conditions/medium/weather/night-fog.png
new file mode 100644
index 00000000..8cabd603
Binary files /dev/null and b/resources/ui/conditions/medium/weather/night-fog.png differ
diff --git a/resources/ui/conditions/medium/weather/night-partly-cloudy.png b/resources/ui/conditions/medium/weather/night-partly-cloudy.png
new file mode 100644
index 00000000..b56b89c8
Binary files /dev/null and b/resources/ui/conditions/medium/weather/night-partly-cloudy.png differ
diff --git a/resources/ui/conditions/medium/weather/night-rain.png b/resources/ui/conditions/medium/weather/night-rain.png
new file mode 100644
index 00000000..94b8e980
Binary files /dev/null and b/resources/ui/conditions/medium/weather/night-rain.png differ
diff --git a/resources/ui/conditions/medium/weather/night-thundersotrm.png b/resources/ui/conditions/medium/weather/night-thundersotrm.png
new file mode 100644
index 00000000..5a549cb5
Binary files /dev/null and b/resources/ui/conditions/medium/weather/night-thundersotrm.png differ
diff --git a/resources/ui/conditions/medium/weather/night-totally-cloud.png b/resources/ui/conditions/medium/weather/night-totally-cloud.png
new file mode 100644
index 00000000..7d5f8718
Binary files /dev/null and b/resources/ui/conditions/medium/weather/night-totally-cloud.png differ
diff --git a/resources/ui/conditions/medium/weather/winds.png b/resources/ui/conditions/medium/weather/winds.png
new file mode 100644
index 00000000..c14eda8a
Binary files /dev/null and b/resources/ui/conditions/medium/weather/winds.png differ