Tweaks: return statement style, icon margin