Now with automatic diamond icons!