Fix search field left padding when icon is hidden

We were missing two things in the calculation:
- The icon's margins
- Taking into account whether the left actions row has anything in it

Handling both causes them to cancel out in the correct way and the left
margin is once again correct when the icon isn't visible.