Revert "Fix Notification Panel"

This reverts commit af6fbd70cb078251e9b44d1b5c33f98c00d2be5c.
Revert "Remove HALO icon"

This reverts commit 4097f989a82898ba7d535da9727d02dec77bb8b8.
TEST!