--- a/src/hbcore/gui/hbwidget.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbcore/gui/hbwidget.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -661,7 +661,8 @@
             return true;
 
         case QEvent::DynamicPropertyChange:             
-            if (!qstrcmp(static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName(), "state")) {
+            if (!qstrcmp(static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName(), "state") ||
+                !qstrcmp(static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName(), "toolbutton_extension_layout")) {
                 if(!d->themingPending){
                     style()->updateThemedParams(this);                    
                 }
@@ -697,7 +698,7 @@
                 HbDeviceProfileChangedEvent* dpEvent = static_cast<HbDeviceProfileChangedEvent*>(event);
                 if ( dpEvent->profile().alternateProfileName() == dpEvent->oldProfile().name() ) {
                     // This is an orientation change event.
-                    if (style()->hasOrientationSpecificStyleRules(this)) {
+                    if (d->polished && style()->hasOrientationSpecificStyleRules(this)) {
                         polishEvent();
                     }
                 } else {
@@ -851,7 +852,7 @@
     backend). When overriding, always call the base classes 
     impelentation.
 
-    \param params, For querying (custom) style parameters from HbStyle.
+    \param params For querying (custom) style parameters from HbStyle.
 
     \sa polish()
 */