diff --git a/plasma-workspace-5.7.3-folderview_layout.patch b/plasma-workspace-5.7.3-folderview_layout.patch
new file mode 100644
index 0000000..f836a37
--- /dev/null
+++ b/plasma-workspace-5.7.3-folderview_layout.patch
@@ -0,0 +1,11 @@
+diff --git a/lookandfeel/contents/defaults b/lookandfeel/contents/defaults
+index 7dbc554..8dca8dc 100644
+--- a/lookandfeel/contents/defaults
++++ b/lookandfeel/contents/defaults
+@@ -21,3 +21,6 @@ LayoutName=org.kde.breeze.desktop
+
+ [kwinrc][WindowDecoration]
+ library=org.kde.breeze
++
++[Desktop][org.kde.plasma.desktop]
++Containment=org.kde.plasma.folder
diff --git a/plasma-workspace-5.7.4-systray_iconSizes.patch b/plasma-workspace-5.7.4-systray_iconSizes.patch
new file mode 100644
index 0000000..82f005f
--- /dev/null
+++ b/plasma-workspace-5.7.4-systray_iconSizes.patch
@@ -0,0 +1,12 @@
+diff -up plasma-workspace-5.7.4/applets/systemtray/package/contents/ui/main.qml.orig plasma-workspace-5.7.4/applets/systemtray/package/contents/ui/main.qml
+--- plasma-workspace-5.7.4/applets/systemtray/package/contents/ui/main.qml.orig	2016-08-24 06:15:17.781268751 -0500
++++ plasma-workspace-5.7.4/applets/systemtray/package/contents/ui/main.qml	2016-08-24 06:17:35.647239516 -0500
+@@ -31,7 +31,7 @@ MouseArea {
+     Layout.minimumHeight: vertical ? tasksRow.implicitHeight + (expander.visible ? expander.implicitHeight : 0) + units.smallSpacing : units.smallSpacing
+ 
+     property bool vertical: plasmoid.formFactor == PlasmaCore.Types.Vertical
+-    property int itemSize: units.roundToIconSize(Math.min(Math.min(width, height), units.iconSizes.medium))
++    property int itemSize: units.roundToIconSize(Math.min(Math.min(width, height), units.iconSizes.smallMedium))
+     property int hiddenItemSize: units.iconSizes.smallMedium
+     property alias expanded: dialog.visible
+     property Item activeApplet
diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index ae3a191..d3eda99 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -44,6 +44,14 @@ Patch100:       plasma-workspace-5.7.95-konsole-in-contextmenu.patch
 Patch101:       plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch
 # remove stuff we don't want or need, plus a minor bit of customization --rex
 Patch102:       startkde.patch
+# revert (semi) regresssion wrt systray icon sizes, http://bugs.kde.org/365570
+# FIXME/TODO: port patch or drop it -- rex (probably drop at this point)
+Patch104:       plasma-workspace-5.7.4-systray_iconSizes.patch
+# default to folderview (instead of desktop) containment, see also
+# https://mail.kde.org/pipermail/distributions/2016-July/000133.html
+# and example,
+# https://github.com/notmart/artwork-lnf-netrunner-core/blob/master/usr/share/plasma/look-and-feel/org.kde.netrunner-core.desktop/contents/defaults
+Patch105:       plasma-workspace-5.7.3-folderview_layout.patch
 
 ## upstreamable Patches
 # (yum) debuginfo-install improvements
@@ -449,6 +457,8 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee
   shell/packageplugins/lookandfeel/lookandfeel.cpp
 %endif
 %patch102 -p1 -b .startkde
+#patch104 -p1
+%patch105 -p1
 
 %if 0%{?fedora} > 21
 cp -a lookandfeel lookandfeel-f22