Add TODO comment & some experimental code regarding the notification icons