                     h += gap; // getStyle("verticalGap");
             }
             
-            if (textWidth || iconWidth)
-            {
-                w += paddingLeft + paddingRight; //getStyle("paddingLeft") + getStyle("paddingRight");
-                h += paddingTop + paddingBottom; //getStyle("paddingTop") + getStyle("paddingBottom");
-            }
-            
-            measuredMinWidth = measuredWidth = Math.max(w, MIN_WIDTH);
+            w += paddingLeft + paddingRight; //getStyle("paddingLeft") + getStyle("paddingRight");
+            h += paddingTop + paddingBottom; //getStyle("paddingTop") + getStyle("paddingBottom");
+            
+            measuredWidth = Math.max(w, MIN_WIDTH);
             measuredMinHeight = measuredHeight = h;
+            measuredMinWidth = iconWidth + paddingLeft + paddingRight;
         }
         
         /**

            
            if (iconInstance)
            {                
                iconInstance.x = Math.round(iconX);
                iconInstance.y = Math.round(iconY);
            }        
        }
        

    import mx.core.UITextField;
    import mx.core.mx_internal;
    import mx.events.FlexEvent;
    import mx.managers.LayoutManager;
    import mx.states.SetProperty;
    import mx.states.State;
    import mx.utils.ColorUtil;
