diff --git a/decorations/settings.cpp b/decorations/settings.cpp
--- a/decorations/settings.cpp
+++ b/decorations/settings.cpp
@@ -37,7 +37,7 @@
 SettingsImpl::SettingsImpl(KDecoration2::DecorationSettings *parent)
     : QObject()
     , DecorationSettingsPrivate(parent)
-    , m_borderSize(KDecoration2::BorderSize::Normal)
+    , m_borderSize(KDecoration2::BorderSize::None)
 {
     readSettings();
 
@@ -145,8 +145,8 @@
     });
     auto it = s_sizes.constFind(name);
     if (it == s_sizes.constEnd()) {
-        // non sense values are interpreted just like normal
-        return KDecoration2::BorderSize::Normal;
+        // nonsense values are interpreted just like none
+        return KDecoration2::BorderSize::None;
     }
     return it.value();
 }
@@ -178,7 +178,7 @@
         m_closeDoubleClickMenu = close;
         emit decorationSettings()->closeOnDoubleClickOnMenuChanged(m_closeDoubleClickMenu);
     }
-    const auto size = stringToSize(config.readEntry("BorderSize", QStringLiteral("Normal")));
+    const auto size = stringToSize(config.readEntry("BorderSize", QStringLiteral("None")));
     if (size != m_borderSize) {
         m_borderSize = size;
         emit decorationSettings()->borderSizeChanged(m_borderSize);
diff --git a/kcmkwin/kwindecoration/kcm.cpp b/kcmkwin/kwindecoration/kcm.cpp
--- a/kcmkwin/kwindecoration/kcm.cpp
+++ b/kcmkwin/kwindecoration/kcm.cpp
@@ -61,7 +61,7 @@
 static const QString s_defaultPlugin = QStringLiteral("org.kde.kwin.aurorae");
 static const QString s_defaultTheme = QStringLiteral("kwin4_decoration_qml_plastik");
 #endif
-static const QString s_borderSizeNormal = QStringLiteral("Normal");
+static const QString s_defaultBorderSize = QStringLiteral("None");
 static const QString s_ghnsIcon = QStringLiteral("get-hot-new-stuff");
 
 ConfigurationForm::ConfigurationForm(QWidget *parent)
@@ -101,7 +101,7 @@
 
     m_quickView->rootContext()->setContextProperty(QStringLiteral("decorationsModel"), m_proxyModel);
     updateColors();
-    m_quickView->rootContext()->setContextProperty("_borderSizesIndex", 3); // 3 is normal
+    m_quickView->rootContext()->setContextProperty("_borderSizesIndex", 0); // 0 is none
     m_quickView->rootContext()->setContextProperty("leftButtons", m_leftButtons);
     m_quickView->rootContext()->setContextProperty("rightButtons", m_rightButtons);
     m_quickView->rootContext()->setContextProperty("availableButtons", m_availableButtons);
@@ -221,10 +221,10 @@
 }
 
 static const QMap<QString, KDecoration2::BorderSize> s_sizes = QMap<QString, KDecoration2::BorderSize>({
-    {QStringLiteral("None"), BorderSize::None},
+    {s_defaultBorderSize, BorderSize::None},
     {QStringLiteral("NoSides"), BorderSize::NoSides},
     {QStringLiteral("Tiny"), BorderSize::Tiny},
-    {s_borderSizeNormal, BorderSize::Normal},
+    {QStringLiteral("Normal"), BorderSize::Normal},
     {QStringLiteral("Large"), BorderSize::Large},
     {QStringLiteral("VeryLarge"), BorderSize::VeryLarge},
     {QStringLiteral("Huge"), BorderSize::Huge},
@@ -236,15 +236,15 @@
 {
     auto it = s_sizes.constFind(name);
     if (it == s_sizes.constEnd()) {
-        // non sense values are interpreted just like normal
-        return BorderSize::Normal;
+        // nonsense values are interpreted just like none
+        return BorderSize::None;
     }
     return it.value();
 }
 
 static QString sizeToString(BorderSize size)
 {
-    return s_sizes.key(size, s_borderSizeNormal);
+    return s_sizes.key(size, s_defaultBorderSize);
 }
 
 static QHash<KDecoration2::DecorationButtonType, QChar> s_buttonNames;
@@ -308,7 +308,7 @@
     const QString plugin = config.readEntry("library", s_defaultPlugin);
     const QString theme = config.readEntry("theme", s_defaultTheme);
     m_ui->closeWindowsDoubleClick->setChecked(config.readEntry("CloseOnDoubleClickOnMenu", false));
-    const QVariant border = QVariant::fromValue(stringToSize(config.readEntry("BorderSize", s_borderSizeNormal)));
+    const QVariant border = QVariant::fromValue(stringToSize(config.readEntry("BorderSize", s_defaultBorderSize)));
     m_ui->borderSizesCombo->setCurrentIndex(m_ui->borderSizesCombo->findData(border));
 
     int themeIndex = m_proxyModel->mapFromSource(m_model->findDecoration(plugin, theme)).row();
@@ -379,7 +379,7 @@
         const QModelIndex index = m_proxyModel->mapFromSource(m_model->findDecoration(s_defaultPlugin));
         listView->setProperty("currentIndex", index.isValid() ? index.row() : -1);
     }
-    m_ui->borderSizesCombo->setCurrentIndex(m_ui->borderSizesCombo->findData(QVariant::fromValue(stringToSize(s_borderSizeNormal))));
+    m_ui->borderSizesCombo->setCurrentIndex(m_ui->borderSizesCombo->findData(QVariant::fromValue(stringToSize(s_defaultBorderSize))));
     m_ui->closeWindowsDoubleClick->setChecked(false);
     KCModule::defaults();
 }