diff --git a/containments/desktop/package/contents/ui/ActionButton.qml b/containments/desktop/package/contents/ui/ActionButton.qml
--- a/containments/desktop/package/contents/ui/ActionButton.qml
+++ b/containments/desktop/package/contents/ui/ActionButton.qml
@@ -52,7 +52,7 @@
         id: toolTip
         text: button.qAction ? button.qAction.text : ""
         delay: 0
-        visible: button.hovered
+        visible: button.hovered && text.length > 0
         x: button.width
         y: button.height/2 - height/2
     }
diff --git a/containments/desktop/package/contents/ui/ConfigOverlay.qml b/containments/desktop/package/contents/ui/ConfigOverlay.qml
--- a/containments/desktop/package/contents/ui/ConfigOverlay.qml
+++ b/containments/desktop/package/contents/ui/ConfigOverlay.qml
@@ -98,7 +98,7 @@
                 id: rotateButton
                 svg: configIconsSvg
                 elementId: "rotate"
-                toolTip: i18n("Rotate")
+                toolTip: !rotateHandle.pressed ? i18n("Rotate") : ""
                 iconSize: overlay.iconSize
                 action: (applet) ? applet.action("rotate") : null
                 down: !rotateHandle.pressed