diff --git a/src/platformtheme/CMakeLists.txt b/src/platformtheme/CMakeLists.txt
--- a/src/platformtheme/CMakeLists.txt
+++ b/src/platformtheme/CMakeLists.txt
@@ -68,5 +68,5 @@
 
 install(TARGETS KDEPlasmaPlatformTheme DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/platformthemes)
 
-install(FILES fonts_global.upd fonts_akregator.upd fonts_kate.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
-install(PROGRAMS fonts_global.pl fonts_akregator.pl fonts_kate.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
+install(FILES fonts_global_toolbar.upd fonts_global.upd fonts_akregator.upd fonts_kate.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
+install(PROGRAMS fonts_global_toolbar.pl fonts_global.pl fonts_akregator.pl fonts_kate.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
diff --git a/src/platformtheme/fonts_global_toolbar.pl b/src/platformtheme/fonts_global_toolbar.pl
new file mode 100755
--- /dev/null
+++ b/src/platformtheme/fonts_global_toolbar.pl
@@ -0,0 +1,16 @@
+#! /usr/bin/perl
+
+# Ensure toolbar font (as displayed) remains the same even after
+# fixing BUG 358254, i.e. copy general font to toolbar font once
+
+use strict;
+
+my $generalFont = "Noto Sans,10,-1,5,50,0,0,0,0,0";
+
+while (<>)
+{
+    chomp;
+    $generalFont = $1 if ($_ =~ /font=(.*)/);
+    s/toolBarFont=.*/toolBarFont=$generalFont/;
+    print "$_\n";
+}
diff --git a/src/platformtheme/fonts_global_toolbar.upd b/src/platformtheme/fonts_global_toolbar.upd
new file mode 100644
--- /dev/null
+++ b/src/platformtheme/fonts_global_toolbar.upd
@@ -0,0 +1,5 @@
+Version=5
+Id=Fonts_Global_Toolbar
+Options=overwrite
+File=kdeglobals
+Script=fonts_global_toolbar.pl,perl
diff --git a/src/platformtheme/kdeplatformtheme.cpp b/src/platformtheme/kdeplatformtheme.cpp
--- a/src/platformtheme/kdeplatformtheme.cpp
+++ b/src/platformtheme/kdeplatformtheme.cpp
@@ -155,7 +155,6 @@
     case TipLabelFont:
     case StatusBarFont:
     case PushButtonFont:
-    case ToolButtonFont:
     case ItemViewFont:
     case ListViewFont:
     case HeaderViewFont:
@@ -172,6 +171,8 @@
         fdtype = KFontSettingsData::SmallestReadableFont; break;
     case FixedFont:
         fdtype = KFontSettingsData::FixedFont; break;
+    case ToolButtonFont:
+        fdtype = KFontSettingsData::ToolbarFont; break;
     default:
         fdtype = KFontSettingsData::GeneralFont; break;
     }
diff --git a/src/platformtheme/kfontsettingsdata.cpp b/src/platformtheme/kfontsettingsdata.cpp
--- a/src/platformtheme/kfontsettingsdata.cpp
+++ b/src/platformtheme/kfontsettingsdata.cpp
@@ -55,7 +55,7 @@
 static const KFontData DefaultFontData[KFontSettingsData::FontTypesCount] = {
     { GeneralId, "font",                 DefaultFont,  10, -1, QFont::SansSerif },
     { GeneralId, "fixed",                "Hack",  9, -1, QFont::Monospace },
-    { GeneralId, "toolBarFont",          DefaultFont,  9, -1, QFont::SansSerif },
+    { GeneralId, "toolBarFont",          DefaultFont,  10, -1, QFont::SansSerif },
     { GeneralId, "menuFont",             DefaultFont,  10, -1, QFont::SansSerif },
     { "WM",      "activeFont",           DefaultFont,  10, -1, QFont::SansSerif },
     { GeneralId, "taskbarFont",          DefaultFont,  10, -1, QFont::SansSerif },