diff --git a/editor/resources/border-icon.png b/editor/resources/border-icon.png
new file mode 100644
index 000000000..c3422c396
Binary files /dev/null and b/editor/resources/border-icon.png differ
diff --git a/editor/resources/checkbox-icon.png b/editor/resources/checkbox-icon.png
new file mode 100644
index 000000000..2bd73133f
Binary files /dev/null and b/editor/resources/checkbox-icon.png differ
diff --git a/editor/resources/fileBrowser-icon.png b/editor/resources/fileBrowser-icon.png
new file mode 100644
index 000000000..34ba0025b
Binary files /dev/null and b/editor/resources/fileBrowser-icon.png differ
diff --git a/editor/resources/image-icon.png b/editor/resources/image-icon.png
new file mode 100644
index 000000000..90e427a3f
Binary files /dev/null and b/editor/resources/image-icon.png differ
diff --git a/editor/resources/inspector-icon.png b/editor/resources/inspector-icon.png
new file mode 100644
index 000000000..93e7df420
Binary files /dev/null and b/editor/resources/inspector-icon.png differ
diff --git a/editor/resources/list-icon.png b/editor/resources/list-icon.png
new file mode 100644
index 000000000..b9abcb2b1
Binary files /dev/null and b/editor/resources/list-icon.png differ
diff --git a/editor/resources/menu-icon.png b/editor/resources/menu-icon.png
new file mode 100644
index 000000000..d96f1ece2
Binary files /dev/null and b/editor/resources/menu-icon.png differ
diff --git a/editor/resources/messageBox-icon.png b/editor/resources/messageBox-icon.png
new file mode 100644
index 000000000..835509e05
Binary files /dev/null and b/editor/resources/messageBox-icon.png differ
diff --git a/editor/resources/popup-icon.png b/editor/resources/popup-icon.png
new file mode 100644
index 000000000..1818c8473
Binary files /dev/null and b/editor/resources/popup-icon.png differ
diff --git a/editor/resources/stackPanel-icon.png b/editor/resources/stackPanel-icon.png
new file mode 100644
index 000000000..8014ae75a
Binary files /dev/null and b/editor/resources/stackPanel-icon.png differ
diff --git a/editor/resources/window-icon.png b/editor/resources/window-icon.png
new file mode 100644
index 000000000..429229e18
Binary files /dev/null and b/editor/resources/window-icon.png differ
diff --git a/editor/src/ui_scene/utils.rs b/editor/src/ui_scene/utils.rs
index b3077d3b1..9acc09c9d 100644
--- a/editor/src/ui_scene/utils.rs
+++ b/editor/src/ui_scene/utils.rs
@@ -7,8 +7,11 @@ use crate::fyrox::{
     },
     graph::{BaseSceneGraph, SceneGraph},
     gui::{
-        button::Button, canvas::Canvas, grid::Grid, screen::Screen, text::Text, UiNode,
-        UserInterface, UserInterfaceResourceExtension,
+        border::Border, button::Button, canvas::Canvas, check_box::CheckBox,
+        file_browser::FileBrowser, grid::Grid, image::Image, inspector::Inspector,
+        list_view::ListView, menu::Menu, messagebox::MessageBox, popup::Popup, screen::Screen,
+        stack_panel::StackPanel, text::Text, window::Window, UiNode, UserInterface,
+        UserInterfaceResourceExtension,
     },
 };
 use crate::{
@@ -97,16 +100,44 @@ impl<'a> WorldViewerDataProvider for UiSceneWorldViewerDataProvider<'a> {
 
         // all icons are able to be used freely
         // todo: add more icons
+
+        // Containers
         if node.cast::<Canvas>().is_some() {
             load_image(include_bytes!("../../resources/canvas-icon.png"))
         } else if node.cast::<Screen>().is_some() {
             load_image(include_bytes!("../../resources/screen-icon.png"))
         } else if node.cast::<Grid>().is_some() {
             load_image(include_bytes!("../../resources/grid-icon.png"))
-        } else if node.cast::<Text>().is_some() {
+        } else if node.cast::<StackPanel>().is_some() {
+            load_image(include_bytes!("../../resources/stackPanel-icon.png"))
+        } else if node.cast::<Window>().is_some() {
+            load_image(include_bytes!("../../resources/window-icon.png"))
+        } else if node.cast::<MessageBox>().is_some() {
+            load_image(include_bytes!("../../resources/messageBox-icon.png"))
+        } else if node.cast::<Menu>().is_some() {
+            load_image(include_bytes!("../../resources/menu-icon.png"))
+        } else if node.cast::<Popup>().is_some() {
+            load_image(include_bytes!("../../resources/popup-icon.png"))
+        }
+        // Visual
+        else if node.cast::<Text>().is_some() {
             load_image(include_bytes!("../../resources/text-icon.png"))
-        } else if node.cast::<Button>().is_some() {
+        } else if node.cast::<Image>().is_some() {
+            load_image(include_bytes!("../../resources/image-icon.png"))
+        } else if node.cast::<Border>().is_some() {
+            load_image(include_bytes!("../../resources/border-icon.png"))
+        }
+        // Controls
+        else if node.cast::<Button>().is_some() {
             load_image(include_bytes!("../../resources/button-icon.png"))
+        } else if node.cast::<CheckBox>().is_some() {
+            load_image(include_bytes!("../../resources/checkbox-icon.png"))
+        } else if node.cast::<ListView>().is_some() {
+            load_image(include_bytes!("../../resources/list-icon.png"))
+        } else if node.cast::<FileBrowser>().is_some() {
+            load_image(include_bytes!("../../resources/fileBrowser-icon.png"))
+        } else if node.cast::<Inspector>().is_some() {
+            load_image(include_bytes!("../../resources/inspector-icon.png"))
         } else {
             None
         }