Merge "Change floating search button icon"