Enhance query/form/image blocks
Update icons for categories/tags blocks