diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml
--- a/lookandfeel/contents/components/ActionButton.qml
+++ b/lookandfeel/contents/components/ActionButton.qml
@@ -17,12 +17,18 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import QtQuick 2.2
+import QtQuick 2.8
+import QtGraphicalEffects 1.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
 Item {
     id: root
+    
+    // If we're using software rendering, draw outlines instead of shadows
+    // See https://bugs.kde.org/show_bug.cgi?id=398317
+    readonly property bool softwareRendering: GraphicsInfo.api === GraphicsInfo.Software
+    
     property alias text: label.text
     property alias iconSource: icon.source
     property alias containsMouse: mouseArea.containsMouse
@@ -48,6 +54,20 @@
         colorGroup: PlasmaCore.ColorScope.colorGroup
         active: mouseArea.containsMouse || root.activeFocus
     }
+    
+    DropShadow {
+            id: labelShadow
+            visible: !softwareRendering
+            anchors.fill: label
+            source: label
+            horizontalOffset: 1
+            verticalOffset: 1
+            radius: 4
+            samples: 9
+            spread: 0.35
+            color: "black" // matches Breeze window decoration and desktopcontainment
+    }
+    
     PlasmaComponents.Label {
         id: label
         anchors {