diff --git a/windowswitchers/IconTabBox.qml b/windowswitchers/IconTabBox.qml
index f1d2effb12448214db03fe1fdf6a9d4ab4b2b928..9d5447e51d4602da76d561f1e669a598a7165ec4 100644
--- a/windowswitchers/IconTabBox.qml
+++ b/windowswitchers/IconTabBox.qml
@@ -9,6 +9,7 @@
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kquickcontrolsaddons 2.0
+import org.kde.kwin 2.0 as KWin
 
 Item {
     id: iconsTabBox
@@ -19,6 +20,8 @@ Item {
         iconsListView.incrementCurrentIndex();
     }
     property int iconSize
+    property bool showThumbnailsForIdenticalIcons: true
+    property bool compositing: true
     property alias count: iconsListView.count
     property alias margins: hoverItem.margins
     property alias currentItem: iconsListView.currentItem
@@ -57,6 +60,16 @@ Item {
                     topMargin: hoverItem.margins.top
                     bottomMargin: hoverItem.margins.bottom
                 }
+                KWin.ThumbnailItem {
+                    anchors.bottom: parent.bottom
+                    anchors.right: parent.right
+                    width: parent.width/2
+                    height: width
+                    visible: iconsTabBox.showThumbnailsForIdenticalIcons
+                             && model.hasIdenticalIcon
+                             && iconsTabBox.compositing
+                    wId: windowId
+                }
             }
             MouseArea {
                 anchors.fill: parent
diff --git a/windowswitchers/big_icons/contents/ui/main.qml b/windowswitchers/big_icons/contents/ui/main.qml
index 81d2f0b58da0846319565ceacdff80af1409d977..1f593e090ea2c831cff4946417fb94386172f3b7 100644
--- a/windowswitchers/big_icons/contents/ui/main.qml
+++ b/windowswitchers/big_icons/contents/ui/main.qml
@@ -38,6 +38,7 @@ KWin.Switcher {
                 id: icons
                 model: tabBox.model
                 iconSize: PlasmaCore.Units.iconSizes.enormous
+                compositing: tabBox.compositing
                 height: iconSize + icons.margins.top + icons.margins.bottom
                 anchors {
                     top: parent.top
diff --git a/windowswitchers/small_icons/contents/ui/main.qml b/windowswitchers/small_icons/contents/ui/main.qml
index ca3a20b1934d49422ba62a9226f8bb21ca61c95d..7686e8240637706e4e1845f4f3698cd03155f080 100644
--- a/windowswitchers/small_icons/contents/ui/main.qml
+++ b/windowswitchers/small_icons/contents/ui/main.qml
@@ -36,6 +36,8 @@ KWin.Switcher {
             IconTabBox {
                 id: icons
                 model: tabBox.model
+                // These icons are too small for thumbnails to be distinguishable
+                showThumbnailsForIdenticalIcons: false
                 iconSize: PlasmaCore.Units.iconSizes.small
                 height: iconSize + icons.margins.top + icons.margins.bottom
                 anchors {