Minor string edit
Merge remote-tracking branch 'upstream/kk-ras-mr1.1' into lichti
Revert "Revert "Navigation bar buttons customization""

This reverts commit 1b56304c9d738149bddadedaaa1375ed4a7d97df.