How do I make Roll20 stop rescaling rectangular tokens into squares?

I'm trying to use Roll20 for Domains at War: Battles, a D&D-compatible wargame (For those Helms Deep/Erfworld type moments when your players have armies. Gleefully recommend to all.) The printed units that came with the game are rectangular. It's easy enough to scan and upload, but when I drag the token from my library onto the map, Roll20 feels compelled to resize it into a square to take up the full hex, giving all my cavalry very long horses. I can manually click on the token and use "set dimensions" to set things right, but I don't see how to make the forced-dimensions version the default, or how to skip the step of rescaling an extra time. In theory I could just make hex/square versions of the units pretty easily and thus prevent Roll20 from adding extra height that way, but I feel like rectangles are ideal because they make it very obvious that each unit has a front, back, and sides, so players can tell at a glance whether their cavalry is in a position to flank or not.

If you are creating a journal entry for the units, you can then setup the token exactly how you like it, then after you have the token the way you want it, go into the journal and link the token. If you already have a token linked, you will need to remove it and link it again.

Awesome, thanks!

if you initially drag the token onto the Map Layer, it should lay down in the regular graphic's proportions instead of squishing it into the grid. The grid only does that on the Token Layer usually.

Also, if you hold Alt while resizing, it won't snap to the grid.