Revert "app: reorder spacing after size in the new spacing override code/ui"

This reverts commit 492e1ab5608ea0ea339702c61e3e707abeb9cf33,
but keeps the code cleanups, and adds some more.