diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py
index dc41f77c7..22346f2b5 100644
--- a/src/Mod/Arch/ArchCommands.py
+++ b/src/Mod/Arch/ArchCommands.py
@@ -1302,12 +1302,12 @@ class _CommandIfcSpreadsheet:
         FreeCAD.ActiveDocument.recompute()
 
 
-class _ToggleSubcomponentDisplay:
-    "the Toggle SubcomponentDisplay command definition"
+class _ToggleSubs:
+    "the ToggleSubs command definition"
     def GetResources(self):
-        return {'Pixmap'  : 'Arch_ToggleSubcomponentDisplay',
-                'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_ToggleSubcomponentDisplay","Toggle subcomponents"),
-                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_ToggleSubcomponentDisplay","Shows or hides the subcomponents of this object")}
+        return {'Pixmap'  : 'Arch_ToggleSubs',
+                'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_ToggleSubs","Toggle subcomponents"),
+                'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_ToggleSubs","Shows or hides the subcomponents of this object")}
 
     def IsActive(self):
         return bool(FreeCADGui.Selection.getSelection())
@@ -1341,4 +1341,4 @@ if FreeCAD.GuiUp:
     FreeCADGui.addCommand('Arch_ToggleIfcBrepFlag',_ToggleIfcBrepFlag())
     FreeCADGui.addCommand('Arch_Component',_CommandComponent())
     FreeCADGui.addCommand('Arch_IfcSpreadsheet',_CommandIfcSpreadsheet())
-    FreeCADGui.addCommand('Arch_ToggleSubcomponentDisplay',_ToggleSubcomponentDisplay())
+    FreeCADGui.addCommand('Arch_ToggleSubs',_ToggleSubs())
diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py
index 61a18c71f..1e9c0fb94 100644
--- a/src/Mod/Arch/InitGui.py
+++ b/src/Mod/Arch/InitGui.py
@@ -44,7 +44,7 @@ class ArchWorkbench(Workbench):
                      "Arch_SelectNonSolidMeshes","Arch_RemoveShape",
                      "Arch_CloseHoles","Arch_MergeWalls","Arch_Check",
                      "Arch_IfcExplorer","Arch_ToggleIfcBrepFlag","Arch_3Views",
-                     "Arch_Bimserver","Arch_Git","Arch_IfcSpreadsheet","Arch_ToggleSubcomponentDisplay"]
+                     "Arch_Bimserver","Arch_Git","Arch_IfcSpreadsheet","Arch_ToggleSubs"]
 
         # draft tools
         self.drafttools = ["Draft_Line","Draft_Wire","Draft_Circle","Draft_Arc","Draft_Ellipse",
diff --git a/src/Mod/Arch/Resources/Arch.qrc b/src/Mod/Arch/Resources/Arch.qrc
index b1e8a8f25..a1d387a93 100644
--- a/src/Mod/Arch/Resources/Arch.qrc
+++ b/src/Mod/Arch/Resources/Arch.qrc
@@ -70,7 +70,7 @@
         <file>icons/Arch_Pipe.svg</file>
         <file>icons/Arch_Pipe_Tree.svg</file>
         <file>icons/Arch_PipeConnector.svg</file>
-        <file>icons/Arch_ToggleSubcomponentDisplay.svg</file>
+        <file>icons/Arch_ToggleSubs.svg</file>
         <file>ui/ParametersWindowDouble.svg</file>
         <file>ui/ParametersWindowSimple.svg</file>
         <file>ui/ParametersWindowFixed.svg</file>
diff --git a/src/Mod/Arch/Resources/icons/Arch_ToggleSubcomponentDisplay.svg b/src/Mod/Arch/Resources/icons/Arch_ToggleSubs.svg
similarity index 100%
rename from src/Mod/Arch/Resources/icons/Arch_ToggleSubcomponentDisplay.svg
rename to src/Mod/Arch/Resources/icons/Arch_ToggleSubs.svg