diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d143652..c2a92893 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
 - Fix cursor tile and player view outlines not updating immediately when toggled in Collision view.
 - Fix selected space not updating while painting in Collision view.
 - Fix collision values of 2 or 3 not rendering properly.
+- Fix the map tree view arrows not displaying for custom themes.
 - Fix the map music dropdown being empty when importing a map from Advance Map.
 - Fix object events added by pasting ignoring the map event limit.
 - Fix a bug where saving the tileset editor would reselect the main editor's first selected metatile.
diff --git a/resources/icons/application_form_edit.ico b/resources/icons/application_form_edit.ico
new file mode 100644
index 00000000..7bb403ea
Binary files /dev/null and b/resources/icons/application_form_edit.ico differ
diff --git a/resources/icons/ui/dark_branch_closed.png b/resources/icons/ui/dark_branch_closed.png
new file mode 100644
index 00000000..3ec17cd0
Binary files /dev/null and b/resources/icons/ui/dark_branch_closed.png differ
diff --git a/resources/icons/ui/dark_branch_closed@2x.png b/resources/icons/ui/dark_branch_closed@2x.png
new file mode 100644
index 00000000..0c6923d7
Binary files /dev/null and b/resources/icons/ui/dark_branch_closed@2x.png differ
diff --git a/resources/icons/ui/dark_branch_end.png b/resources/icons/ui/dark_branch_end.png
new file mode 100644
index 00000000..3c9fddd7
Binary files /dev/null and b/resources/icons/ui/dark_branch_end.png differ
diff --git a/resources/icons/ui/dark_branch_end@2x.png b/resources/icons/ui/dark_branch_end@2x.png
new file mode 100644
index 00000000..c6634506
Binary files /dev/null and b/resources/icons/ui/dark_branch_end@2x.png differ
diff --git a/resources/icons/ui/dark_branch_more.png b/resources/icons/ui/dark_branch_more.png
new file mode 100644
index 00000000..9427c04d
Binary files /dev/null and b/resources/icons/ui/dark_branch_more.png differ
diff --git a/resources/icons/ui/dark_branch_more@2x.png b/resources/icons/ui/dark_branch_more@2x.png
new file mode 100644
index 00000000..424fb995
Binary files /dev/null and b/resources/icons/ui/dark_branch_more@2x.png differ
diff --git a/resources/icons/ui/dark_branch_open.png b/resources/icons/ui/dark_branch_open.png
new file mode 100644
index 00000000..3a0deda6
Binary files /dev/null and b/resources/icons/ui/dark_branch_open.png differ
diff --git a/resources/icons/ui/dark_branch_open@2x.png b/resources/icons/ui/dark_branch_open@2x.png
new file mode 100644
index 00000000..9d5beb9e
Binary files /dev/null and b/resources/icons/ui/dark_branch_open@2x.png differ
diff --git a/resources/icons/ui/midnight_branch_closed.png b/resources/icons/ui/midnight_branch_closed.png
new file mode 100644
index 00000000..ace3fbf9
Binary files /dev/null and b/resources/icons/ui/midnight_branch_closed.png differ
diff --git a/resources/icons/ui/midnight_branch_closed@2x.png b/resources/icons/ui/midnight_branch_closed@2x.png
new file mode 100644
index 00000000..af301bb5
Binary files /dev/null and b/resources/icons/ui/midnight_branch_closed@2x.png differ
diff --git a/resources/icons/ui/midnight_branch_end.png b/resources/icons/ui/midnight_branch_end.png
new file mode 100644
index 00000000..4a8866e4
Binary files /dev/null and b/resources/icons/ui/midnight_branch_end.png differ
diff --git a/resources/icons/ui/midnight_branch_end@2x.png b/resources/icons/ui/midnight_branch_end@2x.png
new file mode 100644
index 00000000..56571f95
Binary files /dev/null and b/resources/icons/ui/midnight_branch_end@2x.png differ
diff --git a/resources/icons/ui/midnight_branch_more.png b/resources/icons/ui/midnight_branch_more.png
new file mode 100644
index 00000000..b2df69f9
Binary files /dev/null and b/resources/icons/ui/midnight_branch_more.png differ
diff --git a/resources/icons/ui/midnight_branch_more@2x.png b/resources/icons/ui/midnight_branch_more@2x.png
new file mode 100644
index 00000000..021f70cd
Binary files /dev/null and b/resources/icons/ui/midnight_branch_more@2x.png differ
diff --git a/resources/icons/ui/midnight_branch_open.png b/resources/icons/ui/midnight_branch_open.png
new file mode 100644
index 00000000..586f5225
Binary files /dev/null and b/resources/icons/ui/midnight_branch_open.png differ
diff --git a/resources/icons/ui/midnight_branch_open@2x.png b/resources/icons/ui/midnight_branch_open@2x.png
new file mode 100644
index 00000000..e24605f1
Binary files /dev/null and b/resources/icons/ui/midnight_branch_open@2x.png differ
diff --git a/resources/icons/ui/midnight_vline.png b/resources/icons/ui/midnight_vline.png
new file mode 100644
index 00000000..8f0c336f
Binary files /dev/null and b/resources/icons/ui/midnight_vline.png differ
diff --git a/resources/images.qrc b/resources/images.qrc
index eacb478a..3c3e6000 100644
--- a/resources/images.qrc
+++ b/resources/images.qrc
@@ -39,6 +39,14 @@
         <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_closed@2x.png</file>
+        <file>icons/ui/dark_branch_open.png</file>
+        <file>icons/ui/dark_branch_open@2x.png</file>
+        <file>icons/ui/dark_branch_end.png</file>
+        <file>icons/ui/dark_branch_end@2x.png</file>
+        <file>icons/ui/dark_branch_more.png</file>
+        <file>icons/ui/dark_branch_more@2x.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>
@@ -47,6 +55,14 @@
         <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_closed@2x.png</file>
+        <file>icons/ui/midnight_branch_open.png</file>
+        <file>icons/ui/midnight_branch_open@2x.png</file>
+        <file>icons/ui/midnight_branch_end.png</file>
+        <file>icons/ui/midnight_branch_end@2x.png</file>
+        <file>icons/ui/midnight_branch_more.png</file>
+        <file>icons/ui/midnight_branch_more@2x.png</file>
         <file>images/blank_tileset.png</file>
         <file>images/collisions.png</file>
         <file>images/Entities_16x16.png</file>
diff --git a/resources/themes/dark.qss b/resources/themes/dark.qss
index a7efe6e1..e02d2a45 100644
--- a/resources/themes/dark.qss
+++ b/resources/themes/dark.qss
@@ -246,6 +246,30 @@ QTreeView::branch {
     background: #19232D;
 }
 
+QTreeView::branch:has-siblings:!adjoins-item {
+    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;
+}
+
+QTreeView::branch:!has-children:!has-siblings:adjoins-item {
+    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);
+}
+
+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);
+}
+
 /* Scroll Bar */
 
 QScrollBar::vertical {
diff --git a/resources/themes/midnight.qss b/resources/themes/midnight.qss
index b8e3d4d2..a8587e59 100644
--- a/resources/themes/midnight.qss
+++ b/resources/themes/midnight.qss
@@ -245,6 +245,30 @@ QTreeView::branch {
     background: #272822;
 }
 
+QTreeView::branch:has-siblings:!adjoins-item {
+    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;
+}
+
+QTreeView::branch:!has-children:!has-siblings:adjoins-item {
+    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);
+}
+
+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);
+}
+
 /* Scroll Bar */
 
 QScrollBar::vertical {