Change some icon positioning, slightly rearrange code