Revert "Try to fix navbar buttons"

This reverts commit 29bc61d82695c8a976c82796e95305d024940a68.
Test

Change-Id: I065694747b49f16b8d49927c346e094d38172aaa