Adding icon buttons and icon toggles