Merge in notification icons fix