Adjust border and spacing
Add icon