Accidental Class change When deploying on spawn map

Does anyone else have the problem of unintentionally changing classes when selecting i point to deploy on when it it near the class icons(screenshot included for example), I find this happens to me every few games and it is somewhat vexing  the overlap of the class icon square is transparent and is not immediately obvious when you are rushing to deploy.  Personally I would like to see the class Icon squares moved to the left side of the screen in a vertical column where there is plenty of real estate or at least make the class icon squares more opaque if they are kept where they are.