New icons, main activity.
Reorg