Fix category icon merging with text

Apologies for the merge commit, I didn't have access to an IDE for this PR.