diff --git a/web/src/elements/table/Table.ts b/web/src/elements/table/Table.ts
index 7753f3f62..7a73b6ba6 100644
--- a/web/src/elements/table/Table.ts
+++ b/web/src/elements/table/Table.ts
@@ -17,6 +17,7 @@ import { AKResponse } from "../../api/Client";
 import { EVENT_REFRESH } from "../../constants";
 import { groupBy } from "../../utils";
 import "../EmptyState";
+import "../buttons/SpinnerButton";
 import "../chips/Chip";
 import "../chips/ChipGroup";
 import { getURLParam, updateURLParams } from "../router/RouteMatch";
@@ -162,12 +163,12 @@ export abstract class Table<T> extends LitElement {
         });
     }
 
-    public fetch(): void {
+    public async fetch(): Promise<void> {
         if (this.isLoading) {
             return;
         }
         this.isLoading = true;
-        this.apiEndpoint(this.page)
+        return this.apiEndpoint(this.page)
             .then((r) => {
                 this.data = r;
                 this.page = r.pagination.current;
@@ -319,19 +320,14 @@ export abstract class Table<T> extends LitElement {
     }
 
     renderToolbar(): TemplateResult {
-        return html`<button
-            @click=${() => {
-                this.dispatchEvent(
-                    new CustomEvent(EVENT_REFRESH, {
-                        bubbles: true,
-                        composed: true,
-                    }),
-                );
+        return html` <ak-spinner-button
+            .callAction=${() => {
+                return this.fetch();
             }}
-            class="pf-c-button pf-m-secondary"
+            class="pf-m-secondary"
         >
-            ${t`Refresh`}
-        </button>`;
+            ${t`Refresh`}</ak-spinner-button
+        >`;
     }
 
     renderToolbarSelected(): TemplateResult {
@@ -350,12 +346,7 @@ export abstract class Table<T> extends LitElement {
             value=${ifDefined(this.search)}
             .onSearch=${(value: string) => {
                 this.search = value;
-                this.dispatchEvent(
-                    new CustomEvent(EVENT_REFRESH, {
-                        bubbles: true,
-                        composed: true,
-                    }),
-                );
+                this.fetch();
                 updateURLParams({
                     search: value,
                 });
@@ -382,12 +373,7 @@ export abstract class Table<T> extends LitElement {
                           .pages=${this.data?.pagination}
                           .pageChangeHandler=${(page: number) => {
                               this.page = page;
-                              this.dispatchEvent(
-                                  new CustomEvent(EVENT_REFRESH, {
-                                      bubbles: true,
-                                      composed: true,
-                                  }),
-                              );
+                              this.fetch();
                           }}
                       >
                       </ak-table-pagination>`
@@ -442,12 +428,7 @@ export abstract class Table<T> extends LitElement {
                           .pages=${this.data?.pagination}
                           .pageChangeHandler=${(page: number) => {
                               this.page = page;
-                              this.dispatchEvent(
-                                  new CustomEvent(EVENT_REFRESH, {
-                                      bubbles: true,
-                                      composed: true,
-                                  }),
-                              );
+                              this.fetch();
                           }}
                       >
                       </ak-table-pagination>
diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po
index 9c8dc5b1d..22615c3ad 100644
--- a/web/src/locales/fr_FR.po
+++ b/web/src/locales/fr_FR.po
@@ -3582,8 +3582,12 @@ msgid "Re-evaluate policies"
 msgstr "Ré-évaluer les politiques"
 
 #: src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts
-msgid "Receive a push notification on your phone to prove your identity."
-msgstr "Recevez une notification push sur votre téléphone pour prouver votre identité."
+msgid "Receive a push notification on your device."
+msgstr ""
+
+#: src/flows/stages/authenticator_validate/AuthenticatorValidateStage.ts
+#~ msgid "Receive a push notification on your phone to prove your identity."
+#~ msgstr "Recevez une notification push sur votre téléphone pour prouver votre identité."
 
 #: src/pages/flows/utils.ts
 #: src/pages/tokens/TokenListPage.ts