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
--- core/windows/src/org/netbeans/core/windows/view/ui/tabcontrol/TabbedAdapter.java		1.27
+++ core/windows/src/org/netbeans/core/windows/view/ui/tabcontrol/TabbedAdapter.java	
@@ -179,0 +179,6 @@ 
+            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
--- openide/explorer/src/org/openide/explorer/view/NodeRenderer.java		1.2
+++ openide/explorer/src/org/openide/explorer/view/NodeRenderer.java	
@@ -180,1 +180,5 @@ 
-        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
--- openide/explorer/src/org/openide/explorer/view/TreeView.java		1.8
+++ openide/explorer/src/org/openide/explorer/view/TreeView.java	
@@ -1520,9 +1520,12 @@ 
-            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;
+                }
@@ -1530,1 +1533,0 @@ 
-
Index: openide/util/src/org/openide/util/IconManager.java
===================================================================
RCS file: /cvs/openide/util/src/org/openide/util/IconManager.java,v
--- openide/util/src/org/openide/util/IconManager.java		1.2
+++ openide/util/src/org/openide/util/IconManager.java	
@@ -365,0 +365,3 @@ 
+        // 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;
@@ -366,1 +369,1 @@ 
-        g.drawImage(image2, x, y, null);
---
+        g.drawImage(image2, newx, y, null);