Merge "Remove the gear icon and change tapping event"