diff --git a/resources/icons/ui/dark_branch_closed.png b/resources/icons/ui/dark/branch_closed.png
similarity index 100%
rename from resources/icons/ui/dark_branch_closed.png
rename to resources/icons/ui/dark/branch_closed.png
diff --git a/resources/icons/ui/dark_branch_end.png b/resources/icons/ui/dark/branch_end.png
similarity index 100%
rename from resources/icons/ui/dark_branch_end.png
rename to resources/icons/ui/dark/branch_end.png
diff --git a/resources/icons/ui/dark_branch_more.png b/resources/icons/ui/dark/branch_more.png
similarity index 100%
rename from resources/icons/ui/dark_branch_more.png
rename to resources/icons/ui/dark/branch_more.png
diff --git a/resources/icons/ui/dark_branch_open.png b/resources/icons/ui/dark/branch_open.png
similarity index 100%
rename from resources/icons/ui/dark_branch_open.png
rename to resources/icons/ui/dark/branch_open.png
diff --git a/resources/icons/ui/dark_checkbox_checked.png b/resources/icons/ui/dark/checkbox_checked.png
similarity index 100%
rename from resources/icons/ui/dark_checkbox_checked.png
rename to resources/icons/ui/dark/checkbox_checked.png
diff --git a/resources/icons/ui/dark_checkbox_checked@2x.png b/resources/icons/ui/dark/checkbox_checked@2x.png
similarity index 100%
rename from resources/icons/ui/dark_checkbox_checked@2x.png
rename to resources/icons/ui/dark/checkbox_checked@2x.png
diff --git a/resources/icons/ui/dark_checkbox_checked_disabled.png b/resources/icons/ui/dark/checkbox_checked_disabled.png
similarity index 100%
rename from resources/icons/ui/dark_checkbox_checked_disabled.png
rename to resources/icons/ui/dark/checkbox_checked_disabled.png
diff --git a/resources/icons/ui/dark_checkbox_checked_disabled@2x.png b/resources/icons/ui/dark/checkbox_checked_disabled@2x.png
similarity index 100%
rename from resources/icons/ui/dark_checkbox_checked_disabled@2x.png
rename to resources/icons/ui/dark/checkbox_checked_disabled@2x.png
diff --git a/resources/icons/ui/dark_checkbox_unchecked.png b/resources/icons/ui/dark/checkbox_unchecked.png
similarity index 100%
rename from resources/icons/ui/dark_checkbox_unchecked.png
rename to resources/icons/ui/dark/checkbox_unchecked.png
diff --git a/resources/icons/ui/dark_checkbox_unchecked@2x.png b/resources/icons/ui/dark/checkbox_unchecked@2x.png
similarity index 100%
rename from resources/icons/ui/dark_checkbox_unchecked@2x.png
rename to resources/icons/ui/dark/checkbox_unchecked@2x.png
diff --git a/resources/icons/ui/dark_checkbox_unchecked_disabled.png b/resources/icons/ui/dark/checkbox_unchecked_disabled.png
similarity index 100%
rename from resources/icons/ui/dark_checkbox_unchecked_disabled.png
rename to resources/icons/ui/dark/checkbox_unchecked_disabled.png
diff --git a/resources/icons/ui/dark_checkbox_unchecked_disabled@2x.png b/resources/icons/ui/dark/checkbox_unchecked_disabled@2x.png
similarity index 100%
rename from resources/icons/ui/dark_checkbox_unchecked_disabled@2x.png
rename to resources/icons/ui/dark/checkbox_unchecked_disabled@2x.png
diff --git a/resources/icons/ui/midnight_branch_closed.png b/resources/icons/ui/midnight/branch_closed.png
similarity index 100%
rename from resources/icons/ui/midnight_branch_closed.png
rename to resources/icons/ui/midnight/branch_closed.png
diff --git a/resources/icons/ui/midnight_branch_end.png b/resources/icons/ui/midnight/branch_end.png
similarity index 100%
rename from resources/icons/ui/midnight_branch_end.png
rename to resources/icons/ui/midnight/branch_end.png
diff --git a/resources/icons/ui/midnight_branch_more.png b/resources/icons/ui/midnight/branch_more.png
similarity index 100%
rename from resources/icons/ui/midnight_branch_more.png
rename to resources/icons/ui/midnight/branch_more.png
diff --git a/resources/icons/ui/midnight_branch_open.png b/resources/icons/ui/midnight/branch_open.png
similarity index 100%
rename from resources/icons/ui/midnight_branch_open.png
rename to resources/icons/ui/midnight/branch_open.png
diff --git a/resources/icons/ui/midnight_checkbox_checked.png b/resources/icons/ui/midnight/checkbox_checked.png
similarity index 100%
rename from resources/icons/ui/midnight_checkbox_checked.png
rename to resources/icons/ui/midnight/checkbox_checked.png
diff --git a/resources/icons/ui/midnight_checkbox_checked@2x.png b/resources/icons/ui/midnight/checkbox_checked@2x.png
similarity index 100%
rename from resources/icons/ui/midnight_checkbox_checked@2x.png
rename to resources/icons/ui/midnight/checkbox_checked@2x.png
diff --git a/resources/icons/ui/midnight_checkbox_checked_disabled.png b/resources/icons/ui/midnight/checkbox_checked_disabled.png
similarity index 100%
rename from resources/icons/ui/midnight_checkbox_checked_disabled.png
rename to resources/icons/ui/midnight/checkbox_checked_disabled.png
diff --git a/resources/icons/ui/midnight_checkbox_checked_disabled@2x.png b/resources/icons/ui/midnight/checkbox_checked_disabled@2x.png
similarity index 100%
rename from resources/icons/ui/midnight_checkbox_checked_disabled@2x.png
rename to resources/icons/ui/midnight/checkbox_checked_disabled@2x.png
diff --git a/resources/icons/ui/midnight_checkbox_unchecked.png b/resources/icons/ui/midnight/checkbox_unchecked.png
similarity index 100%
rename from resources/icons/ui/midnight_checkbox_unchecked.png
rename to resources/icons/ui/midnight/checkbox_unchecked.png
diff --git a/resources/icons/ui/midnight_checkbox_unchecked@2x.png b/resources/icons/ui/midnight/checkbox_unchecked@2x.png
similarity index 100%
rename from resources/icons/ui/midnight_checkbox_unchecked@2x.png
rename to resources/icons/ui/midnight/checkbox_unchecked@2x.png
diff --git a/resources/icons/ui/midnight_checkbox_unchecked_disabled.png b/resources/icons/ui/midnight/checkbox_unchecked_disabled.png
similarity index 100%
rename from resources/icons/ui/midnight_checkbox_unchecked_disabled.png
rename to resources/icons/ui/midnight/checkbox_unchecked_disabled.png
diff --git a/resources/icons/ui/midnight_checkbox_unchecked_disabled@2x.png b/resources/icons/ui/midnight/checkbox_unchecked_disabled@2x.png
similarity index 100%
rename from resources/icons/ui/midnight_checkbox_unchecked_disabled@2x.png
rename to resources/icons/ui/midnight/checkbox_unchecked_disabled@2x.png
diff --git a/resources/icons/ui/midnight_vline.png b/resources/icons/ui/midnight_vline.png
deleted file mode 100644
index 8f0c336f..00000000
Binary files a/resources/icons/ui/midnight_vline.png and /dev/null differ
diff --git a/resources/images.qrc b/resources/images.qrc
index fc1ab757..c3e8aee4 100644
--- a/resources/images.qrc
+++ b/resources/images.qrc
@@ -49,30 +49,30 @@
         <file>icons/viewsprites.ico</file>
         <file>icons/application_form_edit.ico</file>
         <file>icons/connections.ico</file>
-        <file>icons/ui/dark_checkbox_checked_disabled.png</file>
-        <file>icons/ui/dark_checkbox_checked_disabled@2x.png</file>
-        <file>icons/ui/dark_checkbox_checked.png</file>
-        <file>icons/ui/dark_checkbox_checked@2x.png</file>
-        <file>icons/ui/dark_checkbox_unchecked_disabled.png</file>
-        <file>icons/ui/dark_checkbox_unchecked_disabled@2x.png</file>
-        <file>icons/ui/dark_checkbox_unchecked.png</file>
-        <file>icons/ui/dark_checkbox_unchecked@2x.png</file>
-        <file>icons/ui/dark_branch_closed.png</file>
-        <file>icons/ui/dark_branch_open.png</file>
-        <file>icons/ui/dark_branch_end.png</file>
-        <file>icons/ui/dark_branch_more.png</file>
-        <file>icons/ui/midnight_checkbox_checked_disabled.png</file>
-        <file>icons/ui/midnight_checkbox_checked_disabled@2x.png</file>
-        <file>icons/ui/midnight_checkbox_checked.png</file>
-        <file>icons/ui/midnight_checkbox_checked@2x.png</file>
-        <file>icons/ui/midnight_checkbox_unchecked_disabled.png</file>
-        <file>icons/ui/midnight_checkbox_unchecked_disabled@2x.png</file>
-        <file>icons/ui/midnight_checkbox_unchecked.png</file>
-        <file>icons/ui/midnight_checkbox_unchecked@2x.png</file>
-        <file>icons/ui/midnight_branch_closed.png</file>
-        <file>icons/ui/midnight_branch_open.png</file>
-        <file>icons/ui/midnight_branch_end.png</file>
-        <file>icons/ui/midnight_branch_more.png</file>
+        <file>icons/ui/dark/checkbox_checked_disabled.png</file>
+        <file>icons/ui/dark/checkbox_checked_disabled@2x.png</file>
+        <file>icons/ui/dark/checkbox_checked.png</file>
+        <file>icons/ui/dark/checkbox_checked@2x.png</file>
+        <file>icons/ui/dark/checkbox_unchecked_disabled.png</file>
+        <file>icons/ui/dark/checkbox_unchecked_disabled@2x.png</file>
+        <file>icons/ui/dark/checkbox_unchecked.png</file>
+        <file>icons/ui/dark/checkbox_unchecked@2x.png</file>
+        <file>icons/ui/dark/branch_closed.png</file>
+        <file>icons/ui/dark/branch_open.png</file>
+        <file>icons/ui/dark/branch_end.png</file>
+        <file>icons/ui/dark/branch_more.png</file>
+        <file>icons/ui/midnight/checkbox_checked_disabled.png</file>
+        <file>icons/ui/midnight/checkbox_checked_disabled@2x.png</file>
+        <file>icons/ui/midnight/checkbox_checked.png</file>
+        <file>icons/ui/midnight/checkbox_checked@2x.png</file>
+        <file>icons/ui/midnight/checkbox_unchecked_disabled.png</file>
+        <file>icons/ui/midnight/checkbox_unchecked_disabled@2x.png</file>
+        <file>icons/ui/midnight/checkbox_unchecked.png</file>
+        <file>icons/ui/midnight/checkbox_unchecked@2x.png</file>
+        <file>icons/ui/midnight/branch_closed.png</file>
+        <file>icons/ui/midnight/branch_open.png</file>
+        <file>icons/ui/midnight/branch_end.png</file>
+        <file>icons/ui/midnight/branch_more.png</file>
         <file>images/blank_tileset.png</file>
         <file>images/collisions.png</file>
         <file>images/collisions_unknown.png</file>
diff --git a/resources/themes/dark.qss b/resources/themes/dark.qss
index e02d2a45..cf240867 100644
--- a/resources/themes/dark.qss
+++ b/resources/themes/dark.qss
@@ -100,39 +100,39 @@ QMenu::indicator {
 }
 
 QMenu::indicator {
-    image: url(":/icons/ui/dark_checkbox_unchecked.png");
+    image: url(":/icons/ui/dark/checkbox_unchecked.png");
 }
 
 QMenu::indicator:non-exclusive:unchecked {
-    image: url(":/icons/ui/dark_checkbox_unchecked.png");
+    image: url(":/icons/ui/dark/checkbox_unchecked.png");
 }
 
 QMenu::indicator:non-exclusive:unchecked:selected {
-    image: url(":/icons/ui/dark_checkbox_unchecked.png");
+    image: url(":/icons/ui/dark/checkbox_unchecked.png");
 }
 
 QMenu::indicator:non-exclusive:checked {
-    image: url(":/icons/ui/dark_checkbox_checked.png");
+    image: url(":/icons/ui/dark/checkbox_checked.png");
 }
 
 QMenu::indicator:non-exclusive:checked:selected {
-    image: url(":/icons/ui/dark_checkbox_checked.png");
+    image: url(":/icons/ui/dark/checkbox_checked.png");
 }
 
 QMenu::indicator:exclusive:unchecked {
-    image: url(":/icons/ui/dark_checkbox_unchecked.png");
+    image: url(":/icons/ui/dark/checkbox_unchecked.png");
 }
 
 QMenu::indicator:exclusive:unchecked:selected {
-    image: url(":/icons/ui/dark_checkbox_unchecked.png");
+    image: url(":/icons/ui/dark/checkbox_unchecked.png");
 }
 
 QMenu::indicator:exclusive:checked {
-    image: url(":/icons/ui/dark_checkbox_checked.png");
+    image: url(":/icons/ui/dark/checkbox_checked.png");
 }
 
 QMenu::indicator:exclusive:checked:selected {
-    image: url(":/icons/ui/dark_checkbox_checked.png");
+    image: url(":/icons/ui/dark/checkbox_checked.png");
 }
 
 
@@ -204,7 +204,7 @@ QCheckBox::indicator {
 }
 
 QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
-    image: url(:/icons/ui/dark_checkbox_unchecked.png)
+    image: url(:/icons/ui/dark/checkbox_unchecked.png)
 }
 
 QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
@@ -212,11 +212,11 @@ QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
 }
 
 QCheckBox::indicator:unchecked:disabled {
-    image: url(":/icons/ui/dark_checkbox_unchecked_disabled.png");
+    image: url(":/icons/ui/dark/checkbox_unchecked_disabled.png");
 }
 
 QRadioButton::indicator::checked, QCheckBox::indicator::checked {
-    image: url(":/icons/ui/dark_checkbox_checked.png");
+    image: url(":/icons/ui/dark/checkbox_checked.png");
 }
 
 QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
@@ -224,7 +224,7 @@ QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
 }
 
 QCheckBox::indicator:checked:disabled {
-    image: url(":/icons/ui/dark_checkbox_checked_disabled.png");
+    image: url(":/icons/ui/dark/checkbox_checked_disabled.png");
 }
 
 /* Map List View */
@@ -247,27 +247,27 @@ QTreeView::branch {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item {
-    border-image: url(:/icons/ui/dark_vline.png) 0;
+    border-image: url(:/icons/ui/dark/vline.png) 0;
 }
 
 QTreeView::branch:has-siblings:adjoins-item {
-    border-image: url(:/icons/ui/dark_branch_more.png) 0;
+    border-image: url(:/icons/ui/dark/branch_more.png) 0;
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item {
-    border-image: url(:/icons/ui/dark_branch_end.png) 0;
+    border-image: url(:/icons/ui/dark/branch_end.png) 0;
 }
 
 QTreeView::branch:has-children:!has-siblings:closed,
 QTreeView::branch:closed:has-children:has-siblings {
         border-image: none;
-        image: url(:/icons/ui/dark_branch_closed.png);
+        image: url(:/icons/ui/dark/branch_closed.png);
 }
 
 QTreeView::branch:open:has-children:!has-siblings,
 QTreeView::branch:open:has-children:has-siblings  {
         border-image: none;
-        image: url(:/icons/ui/dark_branch_open.png);
+        image: url(:/icons/ui/dark/branch_open.png);
 }
 
 /* Scroll Bar */
diff --git a/resources/themes/midnight.qss b/resources/themes/midnight.qss
index a8587e59..6b9e6bfa 100644
--- a/resources/themes/midnight.qss
+++ b/resources/themes/midnight.qss
@@ -102,39 +102,39 @@ QMenu::indicator {
 }
 
 QMenu::indicator {
-    image: url(":/icons/ui/midnight_checkbox_unchecked.png");
+    image: url(":/icons/ui/midnight/checkbox_unchecked.png");
 }
 
 QMenu::indicator:non-exclusive:unchecked {
-    image: url(":/icons/ui/midnight_checkbox_unchecked.png");
+    image: url(":/icons/ui/midnight/checkbox_unchecked.png");
 }
 
 QMenu::indicator:non-exclusive:unchecked:selected {
-    image: url(":/icons/ui/midnight_checkbox_unchecked.png");
+    image: url(":/icons/ui/midnight/checkbox_unchecked.png");
 }
 
 QMenu::indicator:non-exclusive:checked {
-    image: url(":/icons/ui/midnight_checkbox_checked.png");
+    image: url(":/icons/ui/midnight/checkbox_checked.png");
 }
 
 QMenu::indicator:non-exclusive:checked:selected {
-    image: url(":/icons/ui/midnight_checkbox_checked.png");
+    image: url(":/icons/ui/midnight/checkbox_checked.png");
 }
 
 QMenu::indicator:exclusive:unchecked {
-    image: url(":/icons/ui/midnight_checkbox_unchecked.png");
+    image: url(":/icons/ui/midnight/checkbox_unchecked.png");
 }
 
 QMenu::indicator:exclusive:unchecked:selected {
-    image: url(":/icons/ui/midnight_checkbox_unchecked.png");
+    image: url(":/icons/ui/midnight/checkbox_unchecked.png");
 }
 
 QMenu::indicator:exclusive:checked {
-    image: url(":/icons/ui/midnight_checkbox_checked.png");
+    image: url(":/icons/ui/midnight/checkbox_checked.png");
 }
 
 QMenu::indicator:exclusive:checked:selected {
-    image: url(":/icons/ui/midnight_checkbox_checked.png");
+    image: url(":/icons/ui/midnight/checkbox_checked.png");
 }
 
 /* Combo Boxes */
@@ -203,7 +203,7 @@ QCheckBox::indicator {
 }
 
 QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
-    image: url(:/icons/ui/midnight_checkbox_unchecked.png)
+    image: url(:/icons/ui/midnight/checkbox_unchecked.png)
 }
 
 QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
@@ -211,11 +211,11 @@ QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
 }
 
 QCheckBox::indicator:unchecked:disabled {
-    image: url(":/icons/ui/midnight_checkbox_unchecked_disabled.png");
+    image: url(":/icons/ui/midnight/checkbox_unchecked_disabled.png");
 }
 
 QRadioButton::indicator::checked, QCheckBox::indicator::checked {
-    image: url(":/icons/ui/midnight_checkbox_checked.png");
+    image: url(":/icons/ui/midnight/checkbox_checked.png");
 }
 
 QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
@@ -223,7 +223,7 @@ QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
 }
 
 QCheckBox::indicator:checked:disabled {
-    image: url(":/icons/ui/midnight_checkbox_checked_disabled.png");
+    image: url(":/icons/ui/midnight/checkbox_checked_disabled.png");
 }
 
 /* Map List View */
@@ -246,27 +246,27 @@ QTreeView::branch {
 }
 
 QTreeView::branch:has-siblings:!adjoins-item {
-    border-image: url(:/icons/ui/midnight_vline.png) 0;
+    border-image: url(:/icons/ui/midnight/vline.png) 0;
 }
 
 QTreeView::branch:has-siblings:adjoins-item {
-    border-image: url(:/icons/ui/midnight_branch_more.png) 0;
+    border-image: url(:/icons/ui/midnight/branch_more.png) 0;
 }
 
 QTreeView::branch:!has-children:!has-siblings:adjoins-item {
-    border-image: url(:/icons/ui/midnight_branch_end.png) 0;
+    border-image: url(:/icons/ui/midnight/branch_end.png) 0;
 }
 
 QTreeView::branch:has-children:!has-siblings:closed,
 QTreeView::branch:closed:has-children:has-siblings {
         border-image: none;
-        image: url(:/icons/ui/midnight_branch_closed.png);
+        image: url(:/icons/ui/midnight/branch_closed.png);
 }
 
 QTreeView::branch:open:has-children:!has-siblings,
 QTreeView::branch:open:has-children:has-siblings  {
         border-image: none;
-        image: url(:/icons/ui/midnight_branch_open.png);
+        image: url(:/icons/ui/midnight/branch_open.png);
 }
 
 /* Scroll Bar */