diff --git a/ui/desktop/app/components/toolbar-refresher/index.hbs b/addons/core/addon/components/toolbar-refresher/index.hbs
similarity index 100%
rename from ui/desktop/app/components/toolbar-refresher/index.hbs
rename to addons/core/addon/components/toolbar-refresher/index.hbs
diff --git a/ui/desktop/app/components/toolbar-refresher/index.js b/addons/core/addon/components/toolbar-refresher/index.js
similarity index 100%
rename from ui/desktop/app/components/toolbar-refresher/index.js
rename to addons/core/addon/components/toolbar-refresher/index.js
diff --git a/addons/core/app/components/toolbar-refresher.js b/addons/core/app/components/toolbar-refresher.js
new file mode 100644
index 000000000..57428283e
--- /dev/null
+++ b/addons/core/app/components/toolbar-refresher.js
@@ -0,0 +1 @@
+export { default } from 'core/components/toolbar-refresher';
diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
index 2c3e110dc..72c1b447b 100644
--- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs
@@ -61,9 +61,9 @@
               >{{t 'actions.clear-all-filters'}}
               </Rose::Button>
             {{/if}}
-            <LoadingButton @onClick={{route-action 'refreshSessions'}}>
-              {{t 'actions.refresh'}}
-            </LoadingButton>
+
+            <ToolbarRefresher @onClick={{route-action 'refreshSessions'}} />
+
           </Rose::Form>
         </Rose::Toolbar>
       {{/if}}