Revert "NPE Fix"

BREAKS ICONS FOR THEMES!

This reverts commit 1c215d682c4109f7195a720bff3f5b60782ca665.