Tweaks to icon-attached input elements, 1st pass at button groupings