Fix up icons and add proper border styling