Fix search icon placement and search entry border