diff --git a/plugins/documentview/kdevdocumentview.cpp b/plugins/documentview/kdevdocumentview.cpp
--- a/plugins/documentview/kdevdocumentview.cpp
+++ b/plugins/documentview/kdevdocumentview.cpp
@@ -207,15 +207,13 @@
         ctxMenu->addAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n( "Reload" ), this, SLOT(reloadSelected()));
 
         appendActions(ctxMenu, editActions);
-
-        ctxMenu->addAction(KStandardAction::close(this, SLOT(closeSelected()), ctxMenu));
-        QAction* closeUnselected = ctxMenu->addAction(QIcon::fromTheme(QStringLiteral("document-close")), i18n( "Close Other Files" ), this, SLOT(closeUnselected()));
-        closeUnselected->setEnabled(!m_unselectedDocs.isEmpty());
-
         appendActions(ctxMenu, vcsActions);
-
         appendActions(ctxMenu, extensionActions);
 
+        ctxMenu->addAction(QIcon::fromTheme(QStringLiteral("document-close")), i18n("Close"), this, SLOT(closeSelected()));
+        QAction* closeUnselected = ctxMenu->addAction(QIcon::fromTheme(QStringLiteral("document-close")), i18n( "Close All Other" ), this, SLOT(closeUnselected()));
+        closeUnselected->setEnabled(!m_unselectedDocs.isEmpty());
+
         ctxMenu->exec(event->globalPos());
         delete ctxMenu;
     }
diff --git a/shell/documentcontroller.cpp b/shell/documentcontroller.cpp
--- a/shell/documentcontroller.cpp
+++ b/shell/documentcontroller.cpp
@@ -626,24 +626,24 @@
     action->setEnabled(false);
 
     action = d->close = ac->addAction( QStringLiteral("file_close") );
-    action->setIcon(QIcon::fromTheme(QStringLiteral("window-close")));
+    action->setIcon(QIcon::fromTheme(QStringLiteral("document-close")));
     ac->setDefaultShortcut(action, Qt::CTRL + Qt::Key_W );
     action->setText( i18n( "&Close" ) );
     connect( action, &QAction::triggered, this, &DocumentController::fileClose );
     action->setToolTip( i18n( "Close file" ) );
     action->setWhatsThis( i18n( "Closes current file." ) );
     action->setEnabled(false);
 
     action = d->closeAll = ac->addAction( QStringLiteral("file_close_all") );
-    action->setIcon(QIcon::fromTheme(QStringLiteral("window-close")));
+    action->setIcon(QIcon::fromTheme(QStringLiteral("document-close")));
     action->setText(i18n( "Clos&e All" ) );
     connect( action, &QAction::triggered, this, &DocumentController::closeAllDocuments );
     action->setToolTip( i18n( "Close all open documents" ) );
     action->setWhatsThis( i18n( "Close all open documents, prompting for additional information when necessary." ) );
     action->setEnabled(false);
 
     action = d->closeAllOthers = ac->addAction( QStringLiteral("file_closeother") );
-    action->setIcon(QIcon::fromTheme(QStringLiteral("window-close")));
+    action->setIcon(QIcon::fromTheme(QStringLiteral("document-close")));
     ac->setDefaultShortcut(action, Qt::CTRL + Qt::SHIFT + Qt::Key_W );
     action->setText(i18n( "Close All Ot&hers" ) );
     connect( action, &QAction::triggered, this, &DocumentController::closeAllOtherDocuments );
diff --git a/sublime/container.cpp b/sublime/container.cpp
--- a/sublime/container.cpp
+++ b/sublime/container.cpp
@@ -646,11 +646,11 @@
                                         i18n("Copy Filename"));
         menu.addSeparator();
         closeTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-close")),
-                                        i18n("Close File"));
+                                        i18n("Close"));
         closeOtherTabsAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-close")),
-                                              i18n("Close Other Files"));
+                                              i18n("Close All Other"));
     }
-    QAction* closeAllTabsAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-close")), i18n("Close All Files"));
+    QAction* closeAllTabsAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-close")), i18n("Close All"));
 
     QAction* triggered = menu.exec(senderWidget->mapToGlobal(pos));