borders for icons and other minor changes