Some changes in: "Reworked Navigation Bar Dimensions [WIP] (2/2)"

Change-Id: I9c0c9654bd71ca65abada89901c82137ed850678