[TIMOB-16094] Clean up the bar button items