diff --git a/private/applethandle.cpp b/private/applethandle.cpp
index 1edf98a3d..9232e6c18 100644
--- a/private/applethandle.cpp
+++ b/private/applethandle.cpp
@@ -47,6 +47,7 @@
 #include "corona.h"
 #include "paintutils.h"
 #include "theme.h"
+#include "tooltipmanager.h"
 #include "view.h"
 #include "framesvg.h"
 
@@ -816,12 +817,15 @@ void AppletHandle::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
     Q_UNUSED(event);
     //kDebug() << "hover enter";
 
-    //if a disappear was scheduled stop the timer
-    if (m_leaveTimer->isActive()) {
-        m_leaveTimer->stop();
+    if (m_applet) {
+        ToolTipManager::self()->hide(m_applet);
     }
-    // if we're already fading out, fade back in
-    else if (!m_anim.data() && m_animType == FadeOut) {
+
+    if (m_leaveTimer->isActive()) {
+        //if a disappear was scheduled stop the timer
+        m_leaveTimer->stop();
+    } else if (!m_anim.data() && m_animType == FadeOut) {
+        // if we're already fading out, fade back in
         startFading(FadeIn, m_entryPos, true);
     }
 }
diff --git a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
index 4bf095c9f..5488c7326 100644
--- a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
+++ b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
@@ -54,7 +54,7 @@ Name[tg]=Санҷиш
 Name[th]=ทดสอบ
 Name[tr]=Deneme
 Name[tt]=Тикшерү
-Name[ug]=سىناق
+Name[ug]=سىنا
 Name[uk]=Тест
 Name[vi]=Kiểm tra
 Name[wa]=Sayî
diff --git a/theme.cpp b/theme.cpp
index 114228a18..5de692420 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -527,7 +527,7 @@ void Theme::settingsChanged()
     KConfigGroup cg = d->config();
     d->setThemeName(cg.readEntry("name", ThemePrivate::defaultTheme), false);
     cg = KConfigGroup(cg.config(), "PlasmaToolTips");
-    d->toolTipDelay = cg.readEntry("Delay", qreal(0.7));
+    d->toolTipDelay = cg.readEntry("Delay", 700);
 }
 
 void Theme::setThemeName(const QString &themeName)
diff --git a/tooltipmanager.cpp b/tooltipmanager.cpp
index 887ca26eb..a037b857a 100644
--- a/tooltipmanager.cpp
+++ b/tooltipmanager.cpp
@@ -158,7 +158,7 @@ void ToolTipManager::show(QGraphicsWidget *widget)
         // which can be too much for less powerful CPUs to keep up with
         d->showTimer->start(200);
     } else {
-        d->showTimer->start(delay * 1000);
+        d->showTimer->start(qMax(qreal(200), delay));
     }
 }
 
diff --git a/widgets/iconwidget.cpp b/widgets/iconwidget.cpp
index 4656add64..cb03821cf 100644
--- a/widgets/iconwidget.cpp
+++ b/widgets/iconwidget.cpp
@@ -1378,7 +1378,9 @@ void IconWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
         return;
     }
 
-    d->states |= IconWidgetPrivate::PressedState;
+    if (KGlobalSettings::singleClick() || (receivers(SIGNAL(clicked()))) > 0) {
+        d->states |= IconWidgetPrivate::PressedState;
+    }
     d->clickStartPos = scenePos();
 
     bool handled = false;
@@ -1457,10 +1459,14 @@ void IconWidget::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_UNUSED(event)
 
+    d->states |= IconWidgetPrivate::PressedState;
+
     emit doubleClicked();
     if (!KGlobalSettings::singleClick()) {
         emit activated();
     }
+
+    update();
 }
 
 void IconWidget::hoverEnterEvent(QGraphicsSceneHoverEvent *event)