icon in button should not be margined
Additional fixes