Use launcher icon and reorganize a bit