Merge "Update icons for search and back" into lmp-dev