Index: core/windows/src/org/netbeans/core/windows/view/ui/tabcontrol/TabbedAdapter.java
===================================================================
RCS file: /cvs/core/windows/src/org/netbeans/core/windows/view/ui/tabcontrol/TabbedAdapter.java,v
retrieving revision 1.27
diff -r1.27 TabbedAdapter.java
178a179,184
>             if (icon != null && System.getProperty("no.set.rowheight") != null) {
>             // mkleint just in special mode when we might get bigger sized icons.
>                 if (icon.getHeight(null) > 16) {
>                     icon = icon.getScaledInstance(-1, 16, Image.SCALE_DEFAULT);
>                 }
>             }
Index: openide/explorer/src/org/openide/explorer/view/NodeRenderer.java
===================================================================
RCS file: /cvs/openide/explorer/src/org/openide/explorer/view/NodeRenderer.java,v
retrieving revision 1.2
diff -r1.2 NodeRenderer.java
180c180,184
<         if (icon.getIconWidth() > 0) {
---
> 
>         if (icon.getIconWidth() > 24 && System.getProperty("no.set.rowheight") != null) {
>           // mkleint just in special mode when we might get bigger sized icons.
>             ren.setIconTextGap(4);
>         } else if (icon.getIconWidth() > 0) {
Index: openide/explorer/src/org/openide/explorer/view/TreeView.java
===================================================================
RCS file: /cvs/openide/explorer/src/org/openide/explorer/view/TreeView.java,v
retrieving revision 1.8
diff -r1.8 TreeView.java
1520,1528c1520,1531
<             if (firstPaint) {
<                 calcRowHeight(g);
< 
<                 //This will generate a repaint, so don't bother continuing with super.paint()
<                 //but do paint the background color so it doesn't paint gray the first time
<                 g.setColor(getBackground());
<                 g.fillRect(0, 0, getWidth(), getHeight());
< 
<                 return;
---
>             // mkleint just in special mode when we might get bigger sized icons we want to disable this..
>             if (System.getProperty("no.set.rowheight") == null) {
>                 if (firstPaint) {
>                     calcRowHeight(g);
>                     
>                     //This will generate a repaint, so don't bother continuing with super.paint()
>                     //but do paint the background color so it doesn't paint gray the first time
>                     g.setColor(getBackground());
>                     g.fillRect(0, 0, getWidth(), getHeight());
>                     
>                     return;
>                 }
1530d1532
< 
Index: openide/util/src/org/openide/util/IconManager.java
===================================================================
RCS file: /cvs/openide/util/src/org/openide/util/IconManager.java,v
retrieving revision 1.2
diff -r1.2 IconManager.java
364a365,367
>         // mkleint just in special mode when we might get bigger sized icons.
>         boolean activeMode = System.getProperty("no.set.rowheight") != null;
>         int newx = activeMode && x + image2.getWidth(null) < w ? w - image2.getWidth(null) : x;
366c369
<         g.drawImage(image2, x, y, null);
---
>         g.drawImage(image2, newx, y, null);