Add toggle to decide draw stop icon or not