Merge "Revert "Align more prefs for icon space.""