Completed work on icons and layouts for #247