--- a/src/hbcore/gui/hbtoolbutton.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbtoolbutton.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -243,11 +243,12 @@
     Q_Q(HbToolButton);
     mRepolishRequested = true;
     polishPending = false;
-    q->updateGeometry();
-    QSizeF size = q->minimumSize();
     //Workaround (causing extra polish)
     mSizeHintPolish = false;
     //workaround ends
+    q->updateGeometry();
+    QCoreApplication::sendPostedEvents(q, QEvent::LayoutRequest);
+    QSizeF size = q->minimumSize();
     return size;
 }