Fix alignment, add icon