diff --git a/doc/kcontrol/workspaceoptions/index.docbook b/doc/kcontrol/workspaceoptions/index.docbook
--- a/doc/kcontrol/workspaceoptions/index.docbook
+++ b/doc/kcontrol/workspaceoptions/index.docbook
@@ -7,15 +7,15 @@
 
 <article id="workspaceoptions" lang="&language;">
 <articleinfo>
-<title>Workspace Behaviour</title>
+<title>General Behavior</title>
 <authorgroup>
 <author>&Burkhard.Lueck; &Burkhard.Lueck.mail;</author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 
-<date>2018-05-21</date>
+<date>2019-08-01</date>
 
-<releaseinfo>&plasma; 5.13</releaseinfo>
+<releaseinfo>&plasma; 5.16</releaseinfo>
 
 <keywordset>
 <keyword>System Settings</keyword>
@@ -25,7 +25,7 @@
 
 </articleinfo>
 
-<para>This is a module to configure global options for the &plasma; workspace.
+<para>This is a module to configure the general workspace behavior.
 </para>
 
 <variablelist>
diff --git a/kcms/workspaceoptions/kcm_workspace.desktop b/kcms/workspaceoptions/kcm_workspace.desktop
--- a/kcms/workspaceoptions/kcm_workspace.desktop
+++ b/kcms/workspaceoptions/kcm_workspace.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Icon=plasma
+Icon=preferences-desktop
 Exec=kcmshell5 kcm_workspace
 Type=Service
 X-KDE-ServiceTypes=KCModule
 X-KDE-Library=kcm_workspace
 X-KDE-ParentApp=kcontrol
 X-KDE-System-Settings-Parent-Category=desktopbehavior
 X-KDE-Weight=40
 X-DocPath=kcontrol/workspaceoptions/index.html
-Name=Workspace
+Name=General Behavior
 Name[ar]=مساحة العمل
 Name[bs]=Radna površina
 Name[ca]=Espai de treball
@@ -54,7 +54,7 @@
 Name[x-test]=xxWorkspacexx
 Name[zh_CN]=工作空间
 Name[zh_TW]=工作空間
-Comment=Workspace Behavior
+Comment=Configure general workspace behavior
 Comment[ar]=سلوك مساحة العمل
 Comment[bs]=Ponašanje radnog prostora
 Comment[ca]=Comportament de l'espai de treball
diff --git a/kcms/workspaceoptions/package/metadata.desktop b/kcms/workspaceoptions/package/metadata.desktop
--- a/kcms/workspaceoptions/package/metadata.desktop
+++ b/kcms/workspaceoptions/package/metadata.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Workspace
+Name=General Behavior
 Name[ar]=مساحة العمل
 Name[bs]=Radna površina
 Name[ca]=Espai de treball
@@ -45,7 +45,7 @@
 Name[x-test]=xxWorkspacexx
 Name[zh_CN]=工作空间
 Name[zh_TW]=工作空間
-Comment=Workspace Behavior
+Comment=Configure general workspace behavior
 Comment[ar]=سلوك مساحة العمل
 Comment[bs]=Ponašanje radnog prostora
 Comment[ca]=Comportament de l'espai de treball
@@ -90,7 +90,7 @@
 Comment[x-test]=xxWorkspace Behaviorxx
 Comment[zh_CN]=工作空间行为
 Comment[zh_TW]=工作空間行為
-Icon=plasma
+Icon=preferences-desktop
 Keywords=
 Type=Service
 X-KDE-ParentApp=
diff --git a/kcms/workspaceoptions/workspaceoptions.cpp b/kcms/workspaceoptions/workspaceoptions.cpp
--- a/kcms/workspaceoptions/workspaceoptions.cpp
+++ b/kcms/workspaceoptions/workspaceoptions.cpp
@@ -37,9 +37,9 @@
       m_singleClickCurrentState(true)
 {
     KAboutData* about = new KAboutData(QStringLiteral("kcm_workspace"),
-                                       i18n("Plasma Workspace global options"),
+                                       i18n("General Behavior"),
                                        QStringLiteral("1.1"),
-                                       i18n("System Settings module for managing global options for the Plasma Workspace."),
+                                       i18n("System Settings module for configuring the general workspace behavior."),
                                        KAboutLicense::GPL);
 
     about->addAuthor(i18n("Furkan Tokac"), QString(), QStringLiteral("furkantokac34@gmail.com"));