WP-2069: spacing, icons, and colors.