code changes for changed icon and handling the deactivation through settings