Merge "Remove more car icons and simplify back button to just one icon (1/2)"