diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/sessions.js
index 1e1de9d54..5d2c5227b 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/sessions.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/sessions.js
@@ -1,7 +1,6 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { loading } from 'ember-loading';
 import runEvery from 'ember-pollster/decorators/route/run-every';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
 import { resourceFilter } from 'core/decorators/resource-filter';
@@ -108,7 +107,6 @@ export default class ScopesScopeProjectsSessionsRoute extends Route {
    * refreshes session data.
    */
   @action
-  @loading
   async refreshSessions() {
     return this.refresh();
   }
diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets.js b/ui/desktop/app/routes/scopes/scope/projects/targets.js
index 7fa97b993..6cfa06549 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/targets.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/targets.js
@@ -1,7 +1,6 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { loading } from 'ember-loading';
 import { resourceFilter } from 'core/decorators/resource-filter';
 import runEvery from 'ember-pollster/decorators/route/run-every';
 import config from '../../../../config/environment';
@@ -146,7 +145,6 @@ export default class ScopesScopeProjectsTargetsRoute extends Route {
    * refreshes target data.
    */
   @action
-  @loading
   async refreshTargets() {
     return this.refresh();
   }
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs
index 2043b2a88..ff0f8d4a5 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs
@@ -83,9 +83,9 @@
               >{{t 'actions.clear-all-filters'}}
               </Rose::Button>
             {{/if}}
-            <LoadingButton @onClick={{route-action 'refreshTargets'}}>
-              {{t 'actions.refresh'}}
-            </LoadingButton>
+
+            <ToolbarRefresher @onClick={{route-action 'refreshTargets'}} />
+
           </Rose::Form>
         </Rose::Toolbar>
       {{/if}}