Queries, icon and new layout