Revert "Revert "Icons for future features""

This reverts commit 1dcacc3277ae17e906a81719d8e99e6025b74dee.