Diverse updates + icons
Merger