diff --git a/Base/res/icons/widgets/GButton.png b/Base/res/icons/widgets/GButton.png
new file mode 100644
index 0000000000..7d735c8e73
Binary files /dev/null and b/Base/res/icons/widgets/GButton.png differ
diff --git a/Base/res/icons/widgets/GCheckBox.png b/Base/res/icons/widgets/GCheckBox.png
new file mode 100644
index 0000000000..192972a22c
Binary files /dev/null and b/Base/res/icons/widgets/GCheckBox.png differ
diff --git a/Base/res/icons/widgets/GGroupBox.png b/Base/res/icons/widgets/GGroupBox.png
new file mode 100644
index 0000000000..3e8dd643bd
Binary files /dev/null and b/Base/res/icons/widgets/GGroupBox.png differ
diff --git a/Base/res/icons/widgets/GLabel.png b/Base/res/icons/widgets/GLabel.png
new file mode 100644
index 0000000000..b6eb3a49f6
Binary files /dev/null and b/Base/res/icons/widgets/GLabel.png differ
diff --git a/Base/res/icons/widgets/GProgressBar.png b/Base/res/icons/widgets/GProgressBar.png
new file mode 100644
index 0000000000..a8c5e10a45
Binary files /dev/null and b/Base/res/icons/widgets/GProgressBar.png differ
diff --git a/Base/res/icons/widgets/GRadioButton.png b/Base/res/icons/widgets/GRadioButton.png
new file mode 100644
index 0000000000..c694b06afa
Binary files /dev/null and b/Base/res/icons/widgets/GRadioButton.png differ
diff --git a/Base/res/icons/widgets/GScrollBar.png b/Base/res/icons/widgets/GScrollBar.png
new file mode 100644
index 0000000000..275378e366
Binary files /dev/null and b/Base/res/icons/widgets/GScrollBar.png differ
diff --git a/Base/res/icons/widgets/GSlider.png b/Base/res/icons/widgets/GSlider.png
new file mode 100644
index 0000000000..4f5d54064d
Binary files /dev/null and b/Base/res/icons/widgets/GSlider.png differ
diff --git a/Base/res/icons/widgets/GSpinBox.png b/Base/res/icons/widgets/GSpinBox.png
new file mode 100644
index 0000000000..a81389690a
Binary files /dev/null and b/Base/res/icons/widgets/GSpinBox.png differ
diff --git a/Base/res/icons/widgets/GTextBox.png b/Base/res/icons/widgets/GTextBox.png
new file mode 100644
index 0000000000..48c970e7fc
Binary files /dev/null and b/Base/res/icons/widgets/GTextBox.png differ
diff --git a/DevTools/HackStudio/main.cpp b/DevTools/HackStudio/main.cpp
index e867f13dd1..cf8df9a7d6 100644
--- a/DevTools/HackStudio/main.cpp
+++ b/DevTools/HackStudio/main.cpp
@@ -127,9 +127,16 @@ int main(int argc, char** argv)
     auto form_widgets_toolbar = GToolBar::construct(Orientation::Vertical, 26, g_form_inner_container);
     form_widgets_toolbar->set_preferred_size(38, 0);
 
-    form_widgets_toolbar->add_action(GAction::create("GLabel", GraphicsBitmap::load_from_file("/res/icons/vbwidgets/label.png"), [&](auto&) {}));
-    form_widgets_toolbar->add_action(GAction::create("GButton", GraphicsBitmap::load_from_file("/res/icons/vbwidgets/button.png"), [&](auto&) {}));
-    form_widgets_toolbar->add_action(GAction::create("GSpinBox", GraphicsBitmap::load_from_file("/res/icons/vbwidgets/spinbox.png"), [&](auto&) {}));
+    form_widgets_toolbar->add_action(GAction::create("Cursor", GraphicsBitmap::load_from_file("/res/cursors/arrow.png"), [&](auto&) {
+    }));
+
+    GWidgetClassRegistration::for_each([&](const GWidgetClassRegistration& reg) {
+        auto icon_path = String::format("/res/icons/widgets/%s.png", reg.class_name().characters());
+        auto action = GAction::create(reg.class_name(), GraphicsBitmap::load_from_file(icon_path), [&](auto&) {
+
+        });
+        form_widgets_toolbar->add_action(move(action));
+    });
 
     auto form_editor_inner_splitter = GSplitter::construct(Orientation::Horizontal, g_form_inner_container);