diff --git a/kcms/formats/kcmformats.cpp b/kcms/formats/kcmformats.cpp
index 0a0a72dc9..d40e35ed2 100644
--- a/kcms/formats/kcmformats.cpp
+++ b/kcms/formats/kcmformats.cpp
@@ -1,350 +1,350 @@
 /*
  *  kcmformats.cpp
  *  Copyright 2014 Sebastian Kügler <sebas@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  */
 
 // own
 #include "kcmformats.h"
 #include "ui_kcmformatswidget.h"
 #include "writeexports.h"
 
 // Qt
 #include <QApplication>
 #include <QComboBox>
 #include <QFile>
 #include <QDebug>
 #include <QLocale>
 #include <QStandardPaths>
 #include <QTextStream>
 #include <QTextCodec>
 
 // Frameworks
 #include <KPluginFactory>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KSharedConfig>
 
 K_PLUGIN_FACTORY_WITH_JSON(KCMFormatsFactory, "formats.json", registerPlugin<KCMFormats>();)
 
 KCMFormats::KCMFormats(QWidget *parent, const QVariantList &args)
     : KCModule(parent, args)
 {
     setQuickHelp(i18n("<h1>Formats</h1>"
                       "You can configure the formats used for time, dates, money and other numbers here."));
 
     m_ui = new Ui::KCMFormatsWidget;
     m_ui->setupUi(this);
     m_combos << m_ui->comboGlobal
              << m_ui->comboNumbers
              << m_ui->comboTime
              << m_ui->comboCurrency
              << m_ui->comboMeasurement
              << m_ui->comboCollate;
 }
 
 KCMFormats::~KCMFormats()
 {
     delete m_ui;
 }
 
 bool countryLessThan(const QLocale & c1, const QLocale & c2)
 {
     // Ensure that the "Default (C)" locale always appears at the top
     if (c1.name()=="C" && c2.name()!="C") return true;
     if (c2.name()=="C") return false;
 
     const QString ncn1 = !c1.nativeCountryName().isEmpty() ? c1.nativeCountryName() : QLocale::countryToString(c1.country());
     const QString ncn2 = !c2.nativeCountryName().isEmpty() ? c2.nativeCountryName() : QLocale::countryToString(c2.country());
     return QString::localeAwareCompare(ncn1, ncn2) < 0;
 }
 
 void KCMFormats::load()
 {
     QList<QLocale> allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry);
     qSort(allLocales.begin(), allLocales.end(), countryLessThan);
     foreach(QComboBox * combo, m_combos) {
         initCombo(combo, allLocales);
     }
 
     readConfig();
 
     foreach(QComboBox * combo, m_combos) {
         connectCombo(combo);
     }
 
     connect(m_ui->checkDetailed, &QAbstractButton::toggled, [ = ]() {
         updateExample();
         updateEnabled();
         emit changed(true);
     });
 
     updateEnabled();
     updateExample();
     emit changed(false);
 }
 
 void KCMFormats::initCombo(QComboBox *combo, const QList<QLocale> & allLocales)
 {
     combo->clear();
     const QString clabel = i18n("No change");
     combo->addItem(clabel, QString());
     foreach(const QLocale & l, allLocales) {
         addLocaleToCombo(combo, l);
     }
 }
 
 void KCMFormats::connectCombo(QComboBox *combo)
 {
     connect(combo, &QComboBox::currentTextChanged, [ = ]() {
         emit changed(true);
         updateExample();
     });
 }
 
 void KCMFormats::addLocaleToCombo(QComboBox *combo, const QLocale &locale)
 {
     const QString clabel = !locale.nativeCountryName().isEmpty() ? locale.nativeCountryName() : QLocale::countryToString(locale.country());
     // This needs to use name() rather than bcp47name() or later on the export will generate a non-sense locale (e.g. "it" instead of
     // "it_IT")
     // TODO: Properly handle scripts (@foo)
     QString cvalue = locale.name();
     if (!cvalue.contains('.') && cvalue != QStringLiteral("C")) {
         // explicitly add the encoding,
         // otherwise Qt doesn't accept dead keys and garbles the output as well
         cvalue.append(QLatin1Char('.') + QTextCodec::codecForLocale()->name());
     }
 
     QString flagcode;
     const QStringList split = locale.name().split('_');
     if (split.count() > 1) {
         flagcode = split[1].toLower();
     }
     QIcon flagIcon = loadFlagIcon(flagcode);
 
     const QString nativeLangName = locale.nativeLanguageName();
     if (!nativeLangName.isEmpty()) {
         combo->addItem(flagIcon, i18n("%1 - %2 (%3)", clabel, nativeLangName, locale.name()), cvalue);
     } else {
         combo->addItem(flagIcon, i18n("%1 (%2)", clabel, locale.name()), cvalue);
     }
 }
 
 void setCombo(QComboBox *combo, const QString &key)
 {
     const int ix = combo->findData(key);
     if (ix > -1) {
         combo->setCurrentIndex(ix);
     }
 }
 
 QIcon KCMFormats::loadFlagIcon(const QString &flagCode)
 {
     QIcon icon = m_cachedFlags.value(flagCode);
     if (!icon.isNull()) {
         return icon;
     }
 
     QString flag(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kf5/locale/countries/%1/flag.png").arg(flagCode)));
     if (!flag.isEmpty()) {
         icon = QIcon(flag);
     } else {
         if (m_cachedUnknown.isNull()) {
             m_cachedUnknown = QIcon::fromTheme("unknown");
         }
         icon = m_cachedUnknown;
     }
     m_cachedFlags.insert(flagCode, icon);
 
     return icon;
 }
 
 void KCMFormats::readConfig()
 {
     m_config = KConfigGroup(KSharedConfig::openConfig(configFile), "Formats");
 
     bool useDetailed = m_config.readEntry("useDetailed", false);
     m_ui->checkDetailed->setChecked(useDetailed);
 
     setCombo(m_ui->comboGlobal, m_config.readEntry(lcLang, qgetenv(lcLang.toLatin1())));
 
     setCombo(m_ui->comboNumbers, m_config.readEntry(lcNumeric, qgetenv(lcNumeric.toLatin1())));
     setCombo(m_ui->comboTime, m_config.readEntry(lcTime, qgetenv(lcTime.toLatin1())));
     setCombo(m_ui->comboCollate, m_config.readEntry(lcCollate, qgetenv(lcCollate.toLatin1())));
     setCombo(m_ui->comboCurrency, m_config.readEntry(lcMonetary, qgetenv(lcMonetary.toLatin1())));
     setCombo(m_ui->comboMeasurement, m_config.readEntry(lcMeasurement, qgetenv(lcMeasurement.toLatin1())));
 
     updateEnabled();
 }
 
 void KCMFormats::writeConfig()
 {
     m_config = KConfigGroup(KSharedConfig::openConfig(configFile), "Formats");
 
     // global ends up empty here when OK button is clicked from kcmshell5,
     // apparently the data in the combo is gone by the time save() is called.
     // This might be a problem in KCModule, but does not directly affect us
     // since within systemsettings, it works fine.
     // See https://bugs.kde.org/show_bug.cgi?id=334624
     if (m_ui->comboGlobal->count() == 0) {
         qWarning() << "Couldn't read data from UI, writing configuration failed.";
         return;
     }
     const QString global = m_ui->comboGlobal->currentData().toString();
 
     if (!m_ui->checkDetailed->isChecked()) {
         // Global setting, clean up config
         m_config.deleteEntry("useDetailed");
         if (global.isEmpty()) {
             m_config.deleteEntry(lcLang);
         } else {
             m_config.writeEntry(lcLang, global);
         }
         m_config.deleteEntry(lcNumeric);
         m_config.deleteEntry(lcTime);
         m_config.deleteEntry(lcMonetary);
         m_config.deleteEntry(lcMeasurement);
         m_config.deleteEntry(lcCollate);
         m_config.deleteEntry(lcCtype);
     } else {
         // Save detailed settings
         m_config.writeEntry("useDetailed", true);
 
         if (global.isEmpty()) {
             m_config.deleteEntry(lcLang);
         } else {
             m_config.writeEntry(lcLang, global);
         }
 
         const QString numeric = m_ui->comboNumbers->currentData().toString();
         if (numeric.isEmpty()) {
             m_config.deleteEntry(lcNumeric);
         } else {
             m_config.writeEntry(lcNumeric, numeric);
         }
 
         const QString time = m_ui->comboTime->currentData().toString();
         if (time.isEmpty()) {
             m_config.deleteEntry(lcTime);
         } else {
             m_config.writeEntry(lcTime, time);
         }
 
         const QString monetary = m_ui->comboCurrency->currentData().toString();
         if (monetary.isEmpty()) {
             m_config.deleteEntry(lcMonetary);
         } else {
             m_config.writeEntry(lcMonetary, monetary);
         }
 
         const QString measurement = m_ui->comboMeasurement->currentData().toString();
         if (measurement.isEmpty()) {
             m_config.deleteEntry(lcMeasurement);
         } else {
             m_config.writeEntry(lcMeasurement, measurement);
         }
 
         const QString collate = m_ui->comboCollate->currentData().toString();
         if (collate.isEmpty()) {
             m_config.deleteEntry(lcCollate);
         } else {
             m_config.writeEntry(lcCollate, collate);
         }
     }
 
     m_config.sync();
 }
 
 void KCMFormats::save()
 {
     writeConfig();
     writeExports();
     KMessageBox::information(this, i18n("Your changes will take effect the next time you log in."),
                              i18n("Format Settings Changed"), QStringLiteral("FormatSettingsChanged"));
 }
 
 void KCMFormats::defaults()
 {
     m_ui->checkDetailed->setChecked(false);
 
     // restore user defaults from env vars
     setCombo(m_ui->comboGlobal, qgetenv(lcLang.toLatin1()));
     setCombo(m_ui->comboNumbers, qgetenv(lcNumeric.toLatin1()));
     setCombo(m_ui->comboTime, qgetenv(lcTime.toLatin1()));
     setCombo(m_ui->comboCollate, qgetenv(lcCollate.toLatin1()));
     setCombo(m_ui->comboCurrency, qgetenv(lcMonetary.toLatin1()));
     setCombo(m_ui->comboMeasurement, qgetenv(lcMeasurement.toLatin1()));
 
     updateEnabled();
 }
 
 void KCMFormats::updateEnabled()
 {
     const bool enabled = m_ui->checkDetailed->isChecked();
 
     m_ui->labelNumbers->setEnabled(enabled);
     m_ui->labelTime->setEnabled(enabled);
     m_ui->labelCurrency->setEnabled(enabled);
     m_ui->labelMeasurement->setEnabled(enabled);
     m_ui->labelCollate->setEnabled(enabled);
     m_ui->comboNumbers->setEnabled(enabled);
     m_ui->comboTime->setEnabled(enabled);
     m_ui->comboCurrency->setEnabled(enabled);
     m_ui->comboMeasurement->setEnabled(enabled);
     m_ui->comboCollate->setEnabled(enabled);
 }
 
 void KCMFormats::updateExample()
 {
     const bool useDetailed = m_ui->checkDetailed->isChecked();
 
     QLocale nloc;
     QLocale tloc;
     QLocale cloc;
     QLocale mloc;
 
     if (useDetailed) {
         nloc = QLocale(m_ui->comboNumbers->currentData().toString());
         tloc = QLocale(m_ui->comboTime->currentData().toString());
         cloc = QLocale(m_ui->comboCurrency->currentData().toString());
         mloc = QLocale(m_ui->comboMeasurement->currentData().toString());
     } else {
         nloc = QLocale(m_ui->comboGlobal->currentData().toString());
         tloc = QLocale(m_ui->comboGlobal->currentData().toString());
         cloc = QLocale(m_ui->comboGlobal->currentData().toString());
         mloc = QLocale(m_ui->comboGlobal->currentData().toString());
     }
 
     const QString numberExample = nloc.toString(1000.01);
     const QString timeExample = i18n("%1 (long format)", tloc.toString(QDateTime::currentDateTime())) + QStringLiteral("\n") +
             i18n("%1 (short format)", tloc.toString(QDateTime::currentDateTime(), QLocale::ShortFormat));
-    const QString currencyExample = cloc.toCurrencyString(24);
+    const QString currencyExample = cloc.toCurrencyString(24.00);
 
     QString measurementSetting;
     if (mloc.measurementSystem() == QLocale::ImperialUKSystem) {
         measurementSetting = i18nc("Measurement combobox", "Imperial UK");
     } else if (mloc.measurementSystem() == QLocale::ImperialUSSystem || mloc.measurementSystem() == QLocale::ImperialSystem) {
         measurementSetting = i18nc("Measurement combobox", "Imperial US");
     } else {
         measurementSetting = i18nc("Measurement combobox", "Metric");
     }
 
     m_ui->exampleNumbers->setText(numberExample);
     m_ui->exampleTime->setText(timeExample);
     m_ui->exampleCurrency->setText(currencyExample);
     m_ui->exampleMeasurement->setText(measurementSetting);
 }
 
 #include "kcmformats.moc"
diff --git a/kcms/formats/kcmformatswidget.ui b/kcms/formats/kcmformatswidget.ui
index dfe90648d..938b58568 100644
--- a/kcms/formats/kcmformatswidget.ui
+++ b/kcms/formats/kcmformatswidget.ui
@@ -1,385 +1,385 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <author>Sebastian Kuegler</author>
  <class>KCMFormatsWidget</class>
  <widget class="QWidget" name="KCMFormatsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>755</width>
     <height>585</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="1">
       <layout class="QFormLayout" name="formLayout">
        <property name="fieldGrowthPolicy">
         <enum>QFormLayout::ExpandingFieldsGrow</enum>
        </property>
        <property name="horizontalSpacing">
         <number>6</number>
        </property>
        <property name="verticalSpacing">
         <number>6</number>
        </property>
        <item row="0" column="0">
         <widget class="QLabel" name="label_10">
          <property name="text">
           <string>Re&amp;gion:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
           <cstring>comboGlobal</cstring>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QComboBox" name="comboGlobal">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>300</width>
            <height>0</height>
           </size>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QCheckBox" name="checkDetailed">
          <property name="text">
           <string>De&amp;tailed Settings</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="labelNumbers">
          <property name="text">
           <string>&amp;Numbers:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
           <cstring>comboNumbers</cstring>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
         <widget class="QComboBox" name="comboNumbers">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>300</width>
            <height>0</height>
           </size>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QLabel" name="labelTime">
          <property name="text">
           <string>&amp;Time:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
           <cstring>comboTime</cstring>
          </property>
         </widget>
        </item>
        <item row="3" column="1">
         <widget class="QComboBox" name="comboTime">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>300</width>
            <height>0</height>
           </size>
          </property>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QLabel" name="labelCurrency">
          <property name="text">
           <string>Currenc&amp;y:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
           <cstring>comboCurrency</cstring>
          </property>
         </widget>
        </item>
        <item row="4" column="1">
         <widget class="QComboBox" name="comboCurrency">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>300</width>
            <height>0</height>
           </size>
          </property>
         </widget>
        </item>
        <item row="5" column="0">
         <widget class="QLabel" name="labelMeasurement">
          <property name="text">
           <string>Measurement &amp;Units:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
           <cstring>comboMeasurement</cstring>
          </property>
         </widget>
        </item>
        <item row="5" column="1">
         <widget class="QComboBox" name="comboMeasurement">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>300</width>
            <height>0</height>
           </size>
          </property>
         </widget>
        </item>
        <item row="6" column="0">
         <widget class="QLabel" name="labelCollate">
          <property name="text">
           <string>Co&amp;llation and Sorting:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
           <cstring>comboCollate</cstring>
          </property>
         </widget>
        </item>
        <item row="6" column="1">
         <widget class="QComboBox" name="comboCollate">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>300</width>
            <height>0</height>
           </size>
          </property>
         </widget>
        </item>
        <item row="7" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
           <string/>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="8" column="0">
         <widget class="QLabel" name="labelMeasurement_2">
          <property name="text">
-          <string>&lt;b&gt;Examples&lt;/b&gt;</string>
+          <string>&lt;b&gt;Description&lt;/b&gt;</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="9" column="0">
         <widget class="QLabel" name="lexNumbers">
          <property name="text">
           <string>Numbers:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="9" column="1">
         <widget class="QLabel" name="exampleNumbers">
          <property name="text">
           <string/>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="10" column="0">
         <widget class="QLabel" name="lexTime">
          <property name="text">
           <string>Time:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="10" column="1">
         <widget class="QLabel" name="exampleTime">
          <property name="text">
           <string/>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="11" column="0">
         <widget class="QLabel" name="lexCurrency">
          <property name="text">
           <string>Currency:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="11" column="1">
         <widget class="QLabel" name="exampleCurrency">
          <property name="text">
           <string/>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="12" column="0">
         <widget class="QLabel" name="lexMeasurement_2">
          <property name="text">
           <string>Measurement Units:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
        <item row="12" column="1">
         <widget class="QLabel" name="exampleMeasurement">
          <property name="text">
           <string/>
          </property>
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
         </widget>
        </item>
       </layout>
      </item>
      <item row="0" column="2">
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>16</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item row="0" column="0">
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>16</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer_3">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>32</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>