1 files changed, 11 insertions, 4 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 51814e7..77cf198 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1305,3 +1305,7 @@ void LiquidStyle::drawPushButtonLabel(QPushButton *btn, QPainter *p)
             mode = QIconSet::Active;
-        QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = btn->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = btn->iconSet()->pixmap();
         int pixw = pixmap.width();
@@ -2157,3 +2161,7 @@ static const int windowsRightBorder     = 12;
             mode = QIconSet::Active;
-        QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode);
+        QPixmap pixmap;
+        if ( mode == QIconSet::Disabled )
+            pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = mi->iconSet()->pixmap();
         int pixw = pixmap.width();
@@ -2238,4 +2246,3 @@ int LiquidStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi,
     if (mi->iconSet())
-        h = QMAX(mi->iconSet()->
-                 pixmap(QIconSet::Small, QIconSet::Normal).height(), h);
+        h = QMAX(mi->iconSet()->pixmap().height(), h);