Added Notification toggle icons and re-arranged notification panel settings