Revert "Settings: Handle navbar heights correct on dpi changes + more (2/2)"

This reverts commit 57bffb67c6cccbd4a3ed578890ea10c609baa5ba.

Change-Id: I05066f965cf1ca4b6e60d82caefb17d2e47149f6