Base: Allow hiding notification icons cleanup

* cleanup and make it purdier