update icons, fix layout