diff --git a/src/Gui/CommandWindow.cpp b/src/Gui/CommandWindow.cpp
index db7a887528..91df2ffce8 100644
--- a/src/Gui/CommandWindow.cpp
+++ b/src/Gui/CommandWindow.cpp
@@ -43,33 +43,6 @@
 using namespace Gui;
 
 
-//===========================================================================
-// Std_ArrangeIcons
-//===========================================================================
-DEF_STD_CMD_A(StdCmdArrangeIcons)
-
-StdCmdArrangeIcons::StdCmdArrangeIcons()
-  : Command("Std_ArrangeIcons")
-{
-    sGroup        = "Window";
-    sMenuText     = QT_TR_NOOP("Arrange &Icons");
-    sToolTipText  = QT_TR_NOOP("Arrange Icons");
-    sWhatsThis    = "Std_ArrangeIcons";
-    sStatusTip    = QT_TR_NOOP("Arrange Icons");
-    eType         = 0;
-}
-
-void StdCmdArrangeIcons::activated(int iMsg)
-{
-    Q_UNUSED(iMsg);
-    getMainWindow()->arrangeIcons ();
-}
-
-bool StdCmdArrangeIcons::isActive()
-{
-    return !(getMainWindow()->windows().isEmpty());
-}
-
 //===========================================================================
 // Std_TileWindows
 //===========================================================================
@@ -493,7 +466,6 @@ void CreateWindowStdCommands()
 {
     CommandManager &rcCmdMgr = Application::Instance->commandManager();
 
-    rcCmdMgr.addCommand(new StdCmdArrangeIcons());
     rcCmdMgr.addCommand(new StdCmdTileWindows());
     rcCmdMgr.addCommand(new StdCmdCascadeWindows());
     rcCmdMgr.addCommand(new StdCmdCloseActiveWindow());
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 3e8b6f64fd..a3b3fc99c0 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -193,7 +193,6 @@ protected:
         cMgr.getCommandByName("Std_CloseAllWindows")->addTo(menu);
         menu->addSeparator();
         cMgr.getCommandByName("Std_CascadeWindows")->addTo(menu);
-        cMgr.getCommandByName("Std_ArrangeIcons")->addTo(menu);
         cMgr.getCommandByName("Std_TileWindows")->addTo(menu);
         menu->addSeparator();
         cMgr.getCommandByName("Std_Windows")->addTo(menu);
diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp
index a370ba44e4..b58c3e2eb7 100644
--- a/src/Gui/Workbench.cpp
+++ b/src/Gui/Workbench.cpp
@@ -734,8 +734,8 @@ MenuItem* StdWorkbench::setupMenuBar() const
     auto wnd = new MenuItem( menuBar );
     wnd->setCommand("&Windows");
     *wnd << "Std_ActivateNextWindow" << "Std_ActivatePrevWindow" << "Separator"
-         << "Std_TileWindows" << "Std_CascadeWindows"
-         << "Std_ArrangeIcons" << "Separator" << "Std_WindowsMenu" << "Std_Windows";
+         << "Std_TileWindows" << "Std_CascadeWindows" << "Separator"
+         << "Std_WindowsMenu" << "Std_Windows";
 
     // Separator
     auto sep = new MenuItem( menuBar );
diff --git a/src/Mod/Web/Gui/Workbench.cpp b/src/Mod/Web/Gui/Workbench.cpp
index 9012f34152..39cf43115b 100644
--- a/src/Mod/Web/Gui/Workbench.cpp
+++ b/src/Mod/Web/Gui/Workbench.cpp
@@ -277,8 +277,8 @@ Gui::MenuItem* Workbench::setupMenuBar() const
 //    Gui::MenuItem* wnd = new Gui::MenuItem( menuBar );
 //    wnd->setCommand("&Windows");
 //    *wnd << "Std_ActivateNextWindow" << "Std_ActivatePrevWindow" << "Separator"
-//         << "Std_TileWindows" << "Std_CascadeWindows"
-//         << "Std_ArrangeIcons" << "Separator" << "Std_WindowsMenu" << "Std_Windows";
+//         << "Std_TileWindows" << "Std_CascadeWindows" << "Separator"
+//         << "Std_WindowsMenu" << "Std_Windows";
 //
 //    // help ****************************************************************************************************
 //    // Separator