Margin and Icon fixes