New icon, alignment setting, slight cleanup