Fix iPhone style regression

Make sure all the buttons fit on the screen, git rid of one-off
spacing tweak requested by design (belongs in core)

Change-Id: Ifc2921f8fd331739fd56761249a20a06f0358e7e