Revert "CM11 Themes: Add support for composed icons [2/2]"

This reverts commit 6d8f5fdc9f0bf1358617b840f86d16375382e70b.