This patch looks good that e only move switch icon instead of whole label, there are only two small issue missed:
 - You only set the transition in edit condition, that means there is no icon animation while edit mode dismiss. You may need to set the transition for general span instead of edit mode only(or you did this intentionally because there is no dismiss for text content? ).
 - If you only move the span, you might need to move the transition style from label to span. And the animation duration you set here is a little bit different from the original(0.3 -> 0.4).