Button Icon is now aligned properly (if icon has the right size)..; Some general cleanup