Changed icons to w/p border