Fix 3-button mode navbar

Change-Id: I38b097e709a0b5a5425f4551fd39a28f90a9b58b