Fix checkstyle and compilation.

- The search_w icon was still being referenced in one place.
- Another checkstyle error that got through.

Change-Id: Ie77f827316da4ae52efae7faaa37067eb5728815