Change hero and lock hero on same spot? (UX fail)

Hello

Now it happened to me 2nd time, that I was trying to change my hero before before it was my turn during ranked game. To do that you have to click on small arrow that is placed on same spot, as lock hero when it is your turn. Well and it was suddenly my turn (as opponent did select his hero) - so instead of proceeding to change my hero, I locked different one. Could you please move a little one of these buttons? It is such a big fail to take e.g. lux for a jungle (last minute change) instead of e.g. hecarim...