diff --git a/crates/re_data_ui/src/item_ui.rs b/crates/re_data_ui/src/item_ui.rs
index f1c3582a0999..56b0ccf106ca 100644
--- a/crates/re_data_ui/src/item_ui.rs
+++ b/crates/re_data_ui/src/item_ui.rs
@@ -222,7 +222,7 @@ pub fn data_blueprint_group_button_to(
         .re_ui
         .selectable_label_with_icon(
             ui,
-            &re_ui::icons::CONTAINER,
+            &re_ui::icons::GROUP,
             text,
             ctx.selection().contains_item(&item),
         )
diff --git a/crates/re_ui/data/icons/container.png b/crates/re_ui/data/icons/container.png
deleted file mode 100644
index 1f7eef3faec8..000000000000
Binary files a/crates/re_ui/data/icons/container.png and /dev/null differ
diff --git a/crates/re_ui/data/icons/container_grid.png b/crates/re_ui/data/icons/container_grid.png
index e60925e3f617..c2cbaf80cd6f 100644
Binary files a/crates/re_ui/data/icons/container_grid.png and b/crates/re_ui/data/icons/container_grid.png differ
diff --git a/crates/re_ui/data/icons/container_horizontal.png b/crates/re_ui/data/icons/container_horizontal.png
index ab8b079834ef..e3769dfbf158 100644
Binary files a/crates/re_ui/data/icons/container_horizontal.png and b/crates/re_ui/data/icons/container_horizontal.png differ
diff --git a/crates/re_ui/data/icons/container_tabs.png b/crates/re_ui/data/icons/container_tabs.png
index 0b68360ba3fb..6402454ea036 100644
Binary files a/crates/re_ui/data/icons/container_tabs.png and b/crates/re_ui/data/icons/container_tabs.png differ
diff --git a/crates/re_ui/data/icons/container_vertical.png b/crates/re_ui/data/icons/container_vertical.png
index 304a76afacc1..9259d0434a11 100644
Binary files a/crates/re_ui/data/icons/container_vertical.png and b/crates/re_ui/data/icons/container_vertical.png differ
diff --git a/crates/re_ui/data/icons/group.png b/crates/re_ui/data/icons/group.png
new file mode 100644
index 000000000000..eb926c564722
Binary files /dev/null and b/crates/re_ui/data/icons/group.png differ
diff --git a/crates/re_ui/data/icons/loop.png b/crates/re_ui/data/icons/loop.png
index 831c6aa122df..424006c3a3fe 100644
Binary files a/crates/re_ui/data/icons/loop.png and b/crates/re_ui/data/icons/loop.png differ
diff --git a/crates/re_ui/data/icons/spaceview_2d.png b/crates/re_ui/data/icons/spaceview_2d.png
index 90b75763c95f..85a4d71ff041 100644
Binary files a/crates/re_ui/data/icons/spaceview_2d.png and b/crates/re_ui/data/icons/spaceview_2d.png differ
diff --git a/crates/re_ui/data/icons/spaceview_3d.png b/crates/re_ui/data/icons/spaceview_3d.png
index f13ae740662f..dfb33966ffd5 100644
Binary files a/crates/re_ui/data/icons/spaceview_3d.png and b/crates/re_ui/data/icons/spaceview_3d.png differ
diff --git a/crates/re_ui/src/icons.rs b/crates/re_ui/src/icons.rs
index 27c4c1437dd3..1056c2ac7a6e 100644
--- a/crates/re_ui/src/icons.rs
+++ b/crates/re_ui/src/icons.rs
@@ -133,7 +133,7 @@ pub const SPACE_VIEW_UNKNOWN: Icon = Icon::new(
     include_bytes!("../data/icons/spaceview_unknown.png"),
 );
 
-pub const CONTAINER: Icon = Icon::new("container", include_bytes!("../data/icons/container.png"));
+pub const GROUP: Icon = Icon::new("group", include_bytes!("../data/icons/group.png"));
 
 pub const STORE: Icon = Icon::new("store", include_bytes!("../data/icons/store.png"));
 
diff --git a/crates/re_viewer/src/ui/selection_panel.rs b/crates/re_viewer/src/ui/selection_panel.rs
index 70fa2973553f..c0b0789c1d71 100644
--- a/crates/re_viewer/src/ui/selection_panel.rs
+++ b/crates/re_viewer/src/ui/selection_panel.rs
@@ -392,7 +392,7 @@ fn what_is_selected_ui(
                     ctx.re_ui,
                     ui,
                     &entity_path.to_string(),
-                    Some(&re_ui::icons::CONTAINER),
+                    Some(&re_ui::icons::GROUP),
                     &format!(
                         "Group {:?} as shown in Space View {:?}",
                         entity_path, space_view.display_name
diff --git a/crates/re_viewport/src/viewport.rs b/crates/re_viewport/src/viewport.rs
index b322b9d6a24c..df14723313c7 100644
--- a/crates/re_viewport/src/viewport.rs
+++ b/crates/re_viewport/src/viewport.rs
@@ -762,7 +762,7 @@ impl TabWidget {
         // tab icon
         let icon_size = ReUi::small_icon_size();
         let icon_width_plus_padding = icon_size.x + ReUi::text_to_icon_padding();
-        let icon = space_view.map_or(&re_ui::icons::CONTAINER, |space_view| {
+        let icon = space_view.map_or(&re_ui::icons::SPACE_VIEW_GENERIC, |space_view| {
             space_view
                 .class(tab_viewer.ctx.space_view_class_registry)
                 .icon()
diff --git a/crates/re_viewport/src/viewport_blueprint_ui.rs b/crates/re_viewport/src/viewport_blueprint_ui.rs
index f6c9752b6afc..8734a2b0d971 100644
--- a/crates/re_viewport/src/viewport_blueprint_ui.rs
+++ b/crates/re_viewport/src/viewport_blueprint_ui.rs
@@ -345,7 +345,7 @@ impl Viewport<'_, '_> {
                     .selected(is_selected)
                     .subdued(!properties.visible || !group_is_visible)
                     .force_hovered(is_item_hovered)
-                    .with_icon(&re_ui::icons::CONTAINER)
+                    .with_icon(&re_ui::icons::GROUP)
                     .with_buttons(|re_ui, ui| {
                         let vis_response = visibility_button_ui(
                             re_ui,