Unified border width and added more icons