new icon, back to setting
adjust layout