diff --git a/MediaProtector/App_Plugins/MediaProtector/Components/EventBlocker.cs b/MediaProtector/App_Plugins/MediaProtector/Components/EventBlocker.cs
index fbe10db..cd27cd3 100644
--- a/MediaProtector/App_Plugins/MediaProtector/Components/EventBlocker.cs
+++ b/MediaProtector/App_Plugins/MediaProtector/Components/EventBlocker.cs
@@ -38,7 +38,7 @@ private void MediaService_Saving(IMediaService sender,SaveEventArgs<IMedia> even
                 int _currentUserId;
 
                 using(var contextReference = _context.EnsureUmbracoContext()) {
-                    _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                    _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
                 }
 
                 using(var scope = _scopeProvider.CreateScope(autoComplete: true)) {
@@ -70,7 +70,7 @@ private void MediaService_Deleting(IMediaService sender,DeleteEventArgs<IMedia>
                 int _currentUserId;
 
                 using(var contextReference = _context.EnsureUmbracoContext()) {
-                    _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                    _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
                 }
 
                 using(var scope = _scopeProvider.CreateScope(autoComplete: true)) {
@@ -102,7 +102,7 @@ private void MediaService_Moving(IMediaService sender,MoveEventArgs<IMedia> even
                 int _currentUserId;
 
                 using(var contextReference = _context.EnsureUmbracoContext()) {
-                    _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                    _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
                 }
 
                 using(var scope = _scopeProvider.CreateScope(autoComplete: true)) {
@@ -134,7 +134,7 @@ private void MediaService_Trashing(IMediaService sender,MoveEventArgs<IMedia> ev
                 int _currentUserId;
 
                 using(var contextReference = _context.EnsureUmbracoContext()) {
-                    _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                    _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
                 }
 
                 using(var scope = _scopeProvider.CreateScope(autoComplete: true)) {
diff --git a/MediaProtector/App_Plugins/MediaProtector/JsControllers/content.controller.js b/MediaProtector/App_Plugins/MediaProtector/JsControllers/content.controller.js
index 2ae8df2..df47075 100644
--- a/MediaProtector/App_Plugins/MediaProtector/JsControllers/content.controller.js
+++ b/MediaProtector/App_Plugins/MediaProtector/JsControllers/content.controller.js
@@ -12,7 +12,7 @@
             {
                 name: 'Protection',
                 alias: 'protection',
-                icon: 'icon-custom-account-balance-wallet',
+                icon: 'icon-lock',
                 view: backofficeView + 'protection.html',
                 active: true
             },
diff --git a/MediaProtector/App_Plugins/MediaProtector/backoffice/mediaProtector/info.html b/MediaProtector/App_Plugins/MediaProtector/backoffice/mediaProtector/info.html
index 2aea239..09fa56e 100644
--- a/MediaProtector/App_Plugins/MediaProtector/backoffice/mediaProtector/info.html
+++ b/MediaProtector/App_Plugins/MediaProtector/backoffice/mediaProtector/info.html
@@ -15,7 +15,7 @@ <h4>General Information</h4>
                 <i class="icon-user color-orange"></i> indicate that there is a user exception.
             </li>
             <li>
-                <i class="icon-custom-pause-circle-fill color-red"></i> indicate that all nodes will be protected, regardless of the selection.
+                <i class="icon-block color-red"></i> indicate that all nodes will be protected, regardless of the selection.
             </li>
         </ul>
         <p>
diff --git a/MediaProtector/App_Plugins/MediaProtector/backoffice/mediaProtector/protection.html b/MediaProtector/App_Plugins/MediaProtector/backoffice/mediaProtector/protection.html
index b25924c..0715c02 100644
--- a/MediaProtector/App_Plugins/MediaProtector/backoffice/mediaProtector/protection.html
+++ b/MediaProtector/App_Plugins/MediaProtector/backoffice/mediaProtector/protection.html
@@ -22,7 +22,7 @@
                         <i class="icon-user color-orange"></i>
                     </div>
                     <div class="mp-status" title="Protect all node" ng-show="item.disableEvent">
-                        <i class="icon-custom-pause-circle-fill color-red"></i>
+                        <i class="icon-block color-red"></i>
                     </div>
                 </div>