Add icons, changer query after Carmela fixes