bring code formatting inline with project defaults.
few layout tweak to make layout less dependent on width height. Removed the getHeightValueForIconSize() call.
set toolbar buttons to to an empty boarder to make the toolbar a little closer to the original layout. Height is a little higher then before but I think this is more in line with swing defaults.