diff --git a/Base/res/icons/treeview-collapse.png b/Base/res/icons/treeview-collapse.png
index d56f76a602..451d870226 100644
Binary files a/Base/res/icons/treeview-collapse.png and b/Base/res/icons/treeview-collapse.png differ
diff --git a/Base/res/icons/treeview-expand.png b/Base/res/icons/treeview-expand.png
index 66f5d1e3b6..7beedb7955 100644
Binary files a/Base/res/icons/treeview-expand.png and b/Base/res/icons/treeview-expand.png differ
diff --git a/LibGUI/GTreeView.cpp b/LibGUI/GTreeView.cpp
index 2e7e5ee449..147282f94d 100644
--- a/LibGUI/GTreeView.cpp
+++ b/LibGUI/GTreeView.cpp
@@ -174,7 +174,7 @@ void GTreeView::traverse_in_paint_order(Callback callback) const
             auto node_text = model.data(index, GModel::Role::Display).to_string();
             Rect rect = {
                 x_offset, y_offset,
-                icon_size() + icon_spacing() + font().width(node_text), item_height()
+                toggle_size() + icon_spacing() + icon_size() + icon_spacing() + font().width(node_text), item_height()
             };
             if (rect.intersects(visible_content_rect)) {
                 if (callback(index, rect, indent_level) == IterationDecision::Abort)
@@ -219,7 +219,7 @@ void GTreeView::paint_event(GPaintEvent& event)
         auto icon = model.data(index, GModel::Role::Icon);
         if (icon.is_icon()) {
             if (auto* bitmap = icon.as_icon().bitmap_for_size(icon_size()))
-                painter.blit(rect.location(), *bitmap, bitmap->rect());
+                painter.blit(icon_rect.location(), *bitmap, bitmap->rect());
         }
         Rect text_rect = {
             icon_rect.right() + 1 + icon_spacing(), rect.y(),
@@ -245,6 +245,18 @@ void GTreeView::paint_event(GPaintEvent& event)
             }
             index_at_indent = parent_of_index_at_indent;
         }
+
+        if (model.row_count(index) > 0) {
+            int toggle_x = indent_width_in_pixels() * indent_level - icon_size() / 2 - 3;
+            Rect toggle_rect = { toggle_x, rect.y(), toggle_size(), toggle_size() };
+            toggle_rect.center_vertically_within(rect);
+            auto& metadata = ensure_metadata_for_index(index);
+            if (metadata.open)
+                painter.blit(toggle_rect.location(), *m_collapse_bitmap, m_collapse_bitmap->rect());
+            else
+                painter.blit(toggle_rect.location(), *m_expand_bitmap, m_expand_bitmap->rect());
+        }
+
         return IterationDecision::Continue;
     });
 }
diff --git a/LibGUI/GTreeView.h b/LibGUI/GTreeView.h
index a3603fcc7f..d8c6e005c8 100644
--- a/LibGUI/GTreeView.h
+++ b/LibGUI/GTreeView.h
@@ -21,6 +21,7 @@ private:
     int indent_width_in_pixels() const { return 16; }
     int icon_size() const { return 16; }
     int icon_spacing() const { return 4; }
+    int toggle_size() const { return 9; }
 
     template<typename Callback>
     void traverse_in_paint_order(Callback) const;