Margins and updated icons