diff --git a/resources/builtin/agent.png b/resources/builtin/agent.png
new file mode 100644
index 0000000000..ba103e67ec
Binary files /dev/null and b/resources/builtin/agent.png differ
diff --git a/resources/builtin/blog.png b/resources/builtin/blog.png
index 0d0a838ef3..bb68581a01 100644
Binary files a/resources/builtin/blog.png and b/resources/builtin/blog.png differ
diff --git a/resources/builtin/macro/phabricator1/angelic.png b/resources/builtin/macro/phabricator1/angelic.png
deleted file mode 100644
index 3238593254..0000000000
Binary files a/resources/builtin/macro/phabricator1/angelic.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/capn.png b/resources/builtin/macro/phabricator1/capn.png
deleted file mode 100644
index 136a375198..0000000000
Binary files a/resources/builtin/macro/phabricator1/capn.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/disapprovey.png b/resources/builtin/macro/phabricator1/disapprovey.png
deleted file mode 100644
index 5765cbb3f6..0000000000
Binary files a/resources/builtin/macro/phabricator1/disapprovey.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/hahalol.png b/resources/builtin/macro/phabricator1/hahalol.png
deleted file mode 100644
index 50cf5ebd21..0000000000
Binary files a/resources/builtin/macro/phabricator1/hahalol.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/happyguy.png b/resources/builtin/macro/phabricator1/happyguy.png
deleted file mode 100644
index 0fa43e3950..0000000000
Binary files a/resources/builtin/macro/phabricator1/happyguy.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/itsthedevil.png b/resources/builtin/macro/phabricator1/itsthedevil.png
deleted file mode 100644
index a144ffd6ee..0000000000
Binary files a/resources/builtin/macro/phabricator1/itsthedevil.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/mater.png b/resources/builtin/macro/phabricator1/mater.png
deleted file mode 100644
index 14da77060e..0000000000
Binary files a/resources/builtin/macro/phabricator1/mater.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/mcsquiggles.png b/resources/builtin/macro/phabricator1/mcsquiggles.png
deleted file mode 100644
index 4d6b1d6a55..0000000000
Binary files a/resources/builtin/macro/phabricator1/mcsquiggles.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/mesmerized.png b/resources/builtin/macro/phabricator1/mesmerized.png
deleted file mode 100644
index eb52eec2e3..0000000000
Binary files a/resources/builtin/macro/phabricator1/mesmerized.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/mrclowny.png b/resources/builtin/macro/phabricator1/mrclowny.png
deleted file mode 100644
index 0777a735c3..0000000000
Binary files a/resources/builtin/macro/phabricator1/mrclowny.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/mumbles.png b/resources/builtin/macro/phabricator1/mumbles.png
deleted file mode 100644
index 17bff50699..0000000000
Binary files a/resources/builtin/macro/phabricator1/mumbles.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/ohhrm.png b/resources/builtin/macro/phabricator1/ohhrm.png
deleted file mode 100644
index 28b0c481aa..0000000000
Binary files a/resources/builtin/macro/phabricator1/ohhrm.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/ohisee.png b/resources/builtin/macro/phabricator1/ohisee.png
deleted file mode 100644
index 80017e07cc..0000000000
Binary files a/resources/builtin/macro/phabricator1/ohisee.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/ohunhappy.png b/resources/builtin/macro/phabricator1/ohunhappy.png
deleted file mode 100644
index 8c20a56f9c..0000000000
Binary files a/resources/builtin/macro/phabricator1/ohunhappy.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/sayahh.png b/resources/builtin/macro/phabricator1/sayahh.png
deleted file mode 100644
index 097090a0e0..0000000000
Binary files a/resources/builtin/macro/phabricator1/sayahh.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/smileytongue.png b/resources/builtin/macro/phabricator1/smileytongue.png
deleted file mode 100644
index f3786e7842..0000000000
Binary files a/resources/builtin/macro/phabricator1/smileytongue.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/smirky.png b/resources/builtin/macro/phabricator1/smirky.png
deleted file mode 100644
index 2644ba75cf..0000000000
Binary files a/resources/builtin/macro/phabricator1/smirky.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/squintytongue.png b/resources/builtin/macro/phabricator1/squintytongue.png
deleted file mode 100644
index 36e3699562..0000000000
Binary files a/resources/builtin/macro/phabricator1/squintytongue.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/stunna.png b/resources/builtin/macro/phabricator1/stunna.png
deleted file mode 100644
index e32de27244..0000000000
Binary files a/resources/builtin/macro/phabricator1/stunna.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/thxu.png b/resources/builtin/macro/phabricator1/thxu.png
deleted file mode 100644
index 15308e756d..0000000000
Binary files a/resources/builtin/macro/phabricator1/thxu.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/udidwat.png b/resources/builtin/macro/phabricator1/udidwat.png
deleted file mode 100644
index 2c938647ad..0000000000
Binary files a/resources/builtin/macro/phabricator1/udidwat.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/uhwat.png b/resources/builtin/macro/phabricator1/uhwat.png
deleted file mode 100644
index 8712ef31e3..0000000000
Binary files a/resources/builtin/macro/phabricator1/uhwat.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/undecided.png b/resources/builtin/macro/phabricator1/undecided.png
deleted file mode 100644
index a86d50e68a..0000000000
Binary files a/resources/builtin/macro/phabricator1/undecided.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/vampy.png b/resources/builtin/macro/phabricator1/vampy.png
deleted file mode 100644
index 6b7cb3117c..0000000000
Binary files a/resources/builtin/macro/phabricator1/vampy.png and /dev/null differ
diff --git a/resources/builtin/macro/phabricator1/wowzers.png b/resources/builtin/macro/phabricator1/wowzers.png
deleted file mode 100644
index 228e4c5da5..0000000000
Binary files a/resources/builtin/macro/phabricator1/wowzers.png and /dev/null differ
diff --git a/resources/builtin/mailinglist.png b/resources/builtin/mailinglist.png
new file mode 100644
index 0000000000..58e973608f
Binary files /dev/null and b/resources/builtin/mailinglist.png differ
diff --git a/resources/builtin/profile.png b/resources/builtin/profile.png
index 755d19cd2e..1e1be2a8f9 100644
Binary files a/resources/builtin/profile.png and b/resources/builtin/profile.png differ
diff --git a/resources/builtin/project.png b/resources/builtin/project.png
index 59cf6cf1ad..1e16790ea8 100644
Binary files a/resources/builtin/project.png and b/resources/builtin/project.png differ
diff --git a/resources/builtin/user0.png b/resources/builtin/user0.png
new file mode 100644
index 0000000000..43a4ebceca
Binary files /dev/null and b/resources/builtin/user0.png differ
diff --git a/resources/builtin/user1.png b/resources/builtin/user1.png
new file mode 100644
index 0000000000..0f94001ed7
Binary files /dev/null and b/resources/builtin/user1.png differ
diff --git a/resources/builtin/user2.png b/resources/builtin/user2.png
new file mode 100644
index 0000000000..9629b2d38f
Binary files /dev/null and b/resources/builtin/user2.png differ
diff --git a/resources/builtin/user3.png b/resources/builtin/user3.png
new file mode 100644
index 0000000000..f2f5e2338d
Binary files /dev/null and b/resources/builtin/user3.png differ
diff --git a/resources/builtin/user4.png b/resources/builtin/user4.png
new file mode 100644
index 0000000000..75227cdb8d
Binary files /dev/null and b/resources/builtin/user4.png differ
diff --git a/resources/builtin/user5.png b/resources/builtin/user5.png
new file mode 100644
index 0000000000..3e8aad37dc
Binary files /dev/null and b/resources/builtin/user5.png differ
diff --git a/resources/builtin/user6.png b/resources/builtin/user6.png
new file mode 100644
index 0000000000..20eb2cd9af
Binary files /dev/null and b/resources/builtin/user6.png differ
diff --git a/resources/builtin/user7.png b/resources/builtin/user7.png
new file mode 100644
index 0000000000..a224cdabdf
Binary files /dev/null and b/resources/builtin/user7.png differ
diff --git a/resources/builtin/user8.png b/resources/builtin/user8.png
new file mode 100644
index 0000000000..e0d9fa506d
Binary files /dev/null and b/resources/builtin/user8.png differ
diff --git a/resources/builtin/user9.png b/resources/builtin/user9.png
new file mode 100644
index 0000000000..001f696b94
Binary files /dev/null and b/resources/builtin/user9.png differ