diff --git a/freecad_workbench/freecad/robossembler/Frames.py b/freecad_workbench/freecad/robossembler/Frames.py
index 0c0ca8e..cd26ab8 100644
--- a/freecad_workbench/freecad/robossembler/Frames.py
+++ b/freecad_workbench/freecad/robossembler/Frames.py
@@ -11,7 +11,7 @@ from .usecases.asm4parser_usecase import Asm4StructureParseUseCase
 from .constraints_operator import  create_assembly_parameters, create_fastener_set, create_assembly_sequence, create_clearance_constraint, export_assembly_settings
 from .geometric_feasibility_predicate.main import main as structure_analysis
 from .asm_graph import main as asm_graph
-from .autodock_generator import main as asm_layers
+# from .autodock_generator import main as asm_layers
 from .assembly_graph_generation import main as structure_graph
 
 if FreeCAD.GuiUp:
@@ -337,42 +337,42 @@ spawnClassCommand("Publish_Project",
                            "ToolTip": "Save and export project files"})
 spawnClassCommand("Create Assembly Parameters",
                           create_assembly_parameters,
-                          {"Pixmap": str(os.path.join(ICONPATH, ".svg")),
+                          {"Pixmap": str(os.path.join(ICONPATH, "galternatives.ico")),
                            "MenuText": "Create Assembly Parameters",
                            "ToolTip": "Create Assembly Parameters"})
 spawnClassCommand("Create Fastener Set",
                           create_fastener_set,
-                          {"Pixmap": str(os.path.join(ICONPATH, ".svg")),
+                          {"Pixmap": str(os.path.join(ICONPATH, "screw26.ico")),
                            "MenuText": "Create Fastener Set",
                            "ToolTip": "Create Fastener Set"})
 spawnClassCommand("Compute Assembly Sequence",
                           structure_analysis,
-                          {"Pixmap": str(os.path.join(ICONPATH, ".svg")),
-                           "MenuText": "Create Fastener Set",
-                           "ToolTip": "Create Fastener Set"})
+                          {"Pixmap": str(os.path.join(ICONPATH, "free-icon-software-5741483.png")),
+                           "MenuText": "Compute Assembly Sequence",
+                           "ToolTip": "Compute Assembly Sequence"})
 spawnClassCommand("Create Assembly Sequence",
                           create_assembly_sequence,
-                          {"Pixmap": str(os.path.join(ICONPATH, ".svg")),
+                          {"Pixmap": str(os.path.join(ICONPATH, "assembly.ico")),
                            "MenuText": "Create Assembly Sequence",
                            "ToolTip": "Create Assembly Sequence"})
 spawnClassCommand("Export Assembly Settings",
                           export_assembly_settings,
-                          {"Pixmap": str(os.path.join(ICONPATH, ".svg")),
+                          {"Pixmap": str(os.path.join(ICONPATH, "free-icon-export-724827.ico")),
                            "MenuText": "Export Assembly Settings",
                            "ToolTip": "Export Assembly Settings"})
-spawnClassCommand("Create Assembly Layers",
-                          asm_layers,
-                          {"Pixmap": str(os.path.join(ICONPATH, ".svg")),
-                           "MenuText": "Create Assembly Layers",
-                           "ToolTip": "Create Assembly Layers"})
+# spawnClassCommand("Create Assembly Layers",
+#                           asm_layers,
+#                           {"Pixmap": str(os.path.join(ICONPATH, ".svg")),
+#                            "MenuText": "Create Assembly Layers",
+#                            "ToolTip": "Create Assembly Layers"})
 spawnClassCommand("Create Structure Graph",
                           structure_graph,
-                          {"Pixmap": str(os.path.join(ICONPATH, ".svg")),
+                          {"Pixmap": str(os.path.join(ICONPATH, "pngwing.com.ico")),
                            "MenuText": "Create Structure Graph",
                            "ToolTip": "Create Structure Graph"})
 spawnClassCommand("Create Assembly Graph",
                           asm_graph,
-                          {"Pixmap": str(os.path.join(ICONPATH, ".svg")),
+                          {"Pixmap": str(os.path.join(ICONPATH, "iteration_3316689.ico")),
                            "MenuText": "Create Assembly Graph",
                            "ToolTip": "Create Assembly Graph"})
 
diff --git a/freecad_workbench/freecad/robossembler/init_gui.py b/freecad_workbench/freecad/robossembler/init_gui.py
index 5289d6a..2e857fd 100644
--- a/freecad_workbench/freecad/robossembler/init_gui.py
+++ b/freecad_workbench/freecad/robossembler/init_gui.py
@@ -57,7 +57,7 @@ class Robossembler(Gui.Workbench):
             "Create Assembly Sequence",
             "Export Assembly Settings",
             "Compute Assembly Sequence",
-            "Create Assembly Layers",
+            # "Create Assembly Layers",
             "Create Structure Graph",
             "Create Assembly Graph"            
             
diff --git a/freecad_workbench/freecad/robossembler/resources/icons/assembly.ico b/freecad_workbench/freecad/robossembler/resources/icons/assembly.ico
new file mode 100644
index 0000000..36df58d
Binary files /dev/null and b/freecad_workbench/freecad/robossembler/resources/icons/assembly.ico differ
diff --git a/freecad_workbench/freecad/robossembler/resources/icons/free-icon-export-724827.ico b/freecad_workbench/freecad/robossembler/resources/icons/free-icon-export-724827.ico
new file mode 100644
index 0000000..8101ed1
Binary files /dev/null and b/freecad_workbench/freecad/robossembler/resources/icons/free-icon-export-724827.ico differ
diff --git a/freecad_workbench/freecad/robossembler/resources/icons/free-icon-software-5741483.png b/freecad_workbench/freecad/robossembler/resources/icons/free-icon-software-5741483.png
new file mode 100644
index 0000000..066ccb3
Binary files /dev/null and b/freecad_workbench/freecad/robossembler/resources/icons/free-icon-software-5741483.png differ
diff --git a/freecad_workbench/freecad/robossembler/resources/icons/galternatives.ico b/freecad_workbench/freecad/robossembler/resources/icons/galternatives.ico
new file mode 100644
index 0000000..c810ca6
Binary files /dev/null and b/freecad_workbench/freecad/robossembler/resources/icons/galternatives.ico differ
diff --git a/freecad_workbench/freecad/robossembler/resources/icons/iteration_3316689.ico b/freecad_workbench/freecad/robossembler/resources/icons/iteration_3316689.ico
new file mode 100644
index 0000000..9ed4218
Binary files /dev/null and b/freecad_workbench/freecad/robossembler/resources/icons/iteration_3316689.ico differ
diff --git a/freecad_workbench/freecad/robossembler/resources/icons/pngwing.com.ico b/freecad_workbench/freecad/robossembler/resources/icons/pngwing.com.ico
new file mode 100644
index 0000000..dcc5a1f
Binary files /dev/null and b/freecad_workbench/freecad/robossembler/resources/icons/pngwing.com.ico differ
diff --git a/freecad_workbench/freecad/robossembler/resources/icons/screw26.ico b/freecad_workbench/freecad/robossembler/resources/icons/screw26.ico
new file mode 100644
index 0000000..95d8fcf
Binary files /dev/null and b/freecad_workbench/freecad/robossembler/resources/icons/screw26.ico differ
diff --git a/test_models/crux_hotend.FCStd b/test_models/crux_hotend.FCStd
new file mode 100644
index 0000000..f854ab7
Binary files /dev/null and b/test_models/crux_hotend.FCStd differ