Revert "Align more prefs for icon space."

Bug: 33798492
This reverts commit ded9fc9b0726bae0e7500fa98e6876b6d003d279.

Change-Id: I9831858ffda263496617dff29249e243c007fa12
24 files changed