diff --git a/src/Gui/PreferencePages/DlgSettingsTheme.cpp b/src/Gui/PreferencePages/DlgSettingsTheme.cpp
index 5f76e2beef..7b6c3388b6 100644
--- a/src/Gui/PreferencePages/DlgSettingsTheme.cpp
+++ b/src/Gui/PreferencePages/DlgSettingsTheme.cpp
@@ -59,9 +59,9 @@ DlgSettingsTheme::~DlgSettingsTheme()
 
 void DlgSettingsTheme::saveSettings()
 {
-    ui->ThemeSecondaryColor->onSave();
-    ui->ThemeHighlightColor->onSave();
-    ui->ThemeFocusColor->onSave();
+    ui->ThemeAccentColor1->onSave();
+    ui->ThemeAccentColor2->onSave();
+    ui->ThemeAccentColor3->onSave();
 
     if (styleSheetChanged)
         saveStyleSheet();
@@ -69,9 +69,9 @@ void DlgSettingsTheme::saveSettings()
 
 void DlgSettingsTheme::loadSettings()
 {
-    ui->ThemeSecondaryColor->onRestore();
-    ui->ThemeHighlightColor->onRestore();
-    ui->ThemeFocusColor->onRestore();
+    ui->ThemeAccentColor1->onRestore();
+    ui->ThemeAccentColor2->onRestore();
+    ui->ThemeAccentColor3->onRestore();
 
     loadStyleSheet();
 }
diff --git a/src/Gui/PreferencePages/DlgSettingsTheme.ui b/src/Gui/PreferencePages/DlgSettingsTheme.ui
index 92b33491ee..5d9c842df9 100644
--- a/src/Gui/PreferencePages/DlgSettingsTheme.ui
+++ b/src/Gui/PreferencePages/DlgSettingsTheme.ui
@@ -45,12 +45,12 @@
        <item row="1" column="0">
         <widget class="QLabel">
          <property name="text">
-          <string>Secondary theme color</string>
+          <string>Accent color 1</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
-        <widget class="Gui::PrefColorButton" name="ThemeSecondaryColor">
+        <widget class="Gui::PrefColorButton" name="ThemeAccentColor1">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -68,7 +68,7 @@
           </color>
          </property>
          <property name="prefEntry" stdset="0">
-          <cstring>ThemeSecondaryColor</cstring>
+          <cstring>ThemeAccentColor1</cstring>
          </property>
          <property name="prefPath" stdset="0">
           <cstring>Themes</cstring>
@@ -78,12 +78,12 @@
        <item row="2" column="0">
         <widget class="QLabel">
          <property name="text">
-          <string>Highlight color</string>
+          <string>Accent color 2</string>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
-        <widget class="Gui::PrefColorButton" name="ThemeHighlightColor">
+        <widget class="Gui::PrefColorButton" name="ThemeAccentColor2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -101,7 +101,7 @@
           </color>
          </property>
          <property name="prefEntry" stdset="0">
-          <cstring>ThemeHighlightColor</cstring>
+          <cstring>ThemeAccentColor2</cstring>
          </property>
          <property name="prefPath" stdset="0">
           <cstring>Themes</cstring>
@@ -111,12 +111,12 @@
        <item row="3" column="0">
         <widget class="QLabel">
          <property name="text">
-          <string>Focus theme color</string>
+          <string>Accent color 3</string>
          </property>
         </widget>
        </item>
        <item row="3" column="1">
-        <widget class="Gui::PrefColorButton" name="ThemeFocusColor">
+        <widget class="Gui::PrefColorButton" name="ThemeAccentColor3">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -134,7 +134,7 @@
           </color>
          </property>
          <property name="prefEntry" stdset="0">
-          <cstring>ThemeFocusColor</cstring>
+          <cstring>ThemeAccentColor3</cstring>
          </property>
          <property name="prefPath" stdset="0">
           <cstring>Themes</cstring>