comment out search icon
changed some string IDs
Merge remote-tracking branch 'upstream/master'