Make icon part of label
Optimize grid view spacing