Merge "Use proper icon size for default app prefs." into pi-dev