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

This reverts commit 3dbf721879526b981fb0c6ad98e559dd6febad65.

Conflicts:
	res/values/cr_dimens.xml