Merge "Use a common style for custom preference icon layouts"