Handle navbar heights correct on dpi changes + more (2/2)

Change-Id: I7067b29a2125ab643efbffcc173b38b426a1b8d7
Signed-off-by: iceandfire <arhamjamal@gmail.com>