diff --git a/app/components/notifications-page/messages/nf-str-url-upldfailnprjdeny1/index.hbs b/app/components/notifications-page/messages/nf-str-url-upldfailnprjdeny1/index.hbs
index 49d5090f3..94963a351 100644
--- a/app/components/notifications-page/messages/nf-str-url-upldfailnprjdeny1/index.hbs
+++ b/app/components/notifications-page/messages/nf-str-url-upldfailnprjdeny1/index.hbs
@@ -9,15 +9,16 @@
   </AkTypography>
 
   <div data-test-nf-str-url-upldfailnprjdeny1-link>
-    <AkLink
+    <AkButton
+      @tag='a'
+      @variant='text'
       @color='primary'
       @underline='always'
       target='_blank'
       href={{@context.store_url}}
       rel='noopener noreferrer'
-      @title={{t 'notificationModule.viewAppOnStore'}}
     >
       {{t 'notificationModule.viewAppOnStore'}}
-    </AkLink>
+    </AkButton>
   </div>
 </AkStack>
\ No newline at end of file
diff --git a/app/components/notifications-page/messages/nf-str-url-upldfailnprjdeny2/index.hbs b/app/components/notifications-page/messages/nf-str-url-upldfailnprjdeny2/index.hbs
index 4d0923b49..149ba3872 100644
--- a/app/components/notifications-page/messages/nf-str-url-upldfailnprjdeny2/index.hbs
+++ b/app/components/notifications-page/messages/nf-str-url-upldfailnprjdeny2/index.hbs
@@ -38,16 +38,17 @@
     {{#if @context.store_url}}
       <span local-class='pipe'>|</span>
 
-      <AkLink
+      <AkButton
         data-test-nf-str-url-upldfailnprjdeny2-viewAppOnStorelink
+        @tag='a'
+        @variant='text'
         @underline='always'
         target='_blank'
         href={{@context.store_url}}
         rel='noopener noreferrer'
-        @title={{t 'notificationModule.viewAppOnStore'}}
       >
         {{t 'notificationModule.viewAppOnStore'}}
-      </AkLink>
+      </AkButton>
     {{/if}}
   </AkStack>
 </AkStack>
\ No newline at end of file
diff --git a/app/components/notifications-page/messages/nf-str-url-upldfailnscreatd1/index.hbs b/app/components/notifications-page/messages/nf-str-url-upldfailnscreatd1/index.hbs
index 9a4e51129..8567bc00d 100644
--- a/app/components/notifications-page/messages/nf-str-url-upldfailnscreatd1/index.hbs
+++ b/app/components/notifications-page/messages/nf-str-url-upldfailnscreatd1/index.hbs
@@ -8,15 +8,16 @@
   </AkTypography>
 
   <div data-test-nf-str-url-upldfailnscreatd1-link>
-    <AkLink
+    <AkButton
+      @tag='a'
+      @variant='text'
       @color='primary'
       @underline='always'
       target='_blank'
       href={{@context.store_url}}
       rel='noopener noreferrer'
-      @title={{t 'notificationModule.viewAppOnStore'}}
     >
       {{t 'notificationModule.viewAppOnStore'}}
-    </AkLink>
+    </AkButton>
   </div>
 </AkStack>
\ No newline at end of file
diff --git a/app/components/notifications-page/messages/nf-str-url-upldfailnsunaprv1/index.hbs b/app/components/notifications-page/messages/nf-str-url-upldfailnsunaprv1/index.hbs
index 99035eec4..61408587a 100644
--- a/app/components/notifications-page/messages/nf-str-url-upldfailnsunaprv1/index.hbs
+++ b/app/components/notifications-page/messages/nf-str-url-upldfailnsunaprv1/index.hbs
@@ -8,15 +8,16 @@
   </AkTypography>
 
   <div data-test-nf-str-url-upldfailnsunaprv1-link>
-    <AkLink
+    <AkButton
+      @tag='a'
+      @variant='text'
       @color='primary'
       @underline='always'
       target='_blank'
       href={{@context.store_url}}
       rel='noopener noreferrer'
-      @title={{t 'notificationModule.viewAppOnStore'}}
     >
       {{t 'notificationModule.viewAppOnStore'}}
-    </AkLink>
+    </AkButton>
   </div>
 </AkStack>
\ No newline at end of file
diff --git a/app/components/notifications-page/messages/nf-str-url-upldfailpay2/index.hbs b/app/components/notifications-page/messages/nf-str-url-upldfailpay2/index.hbs
index 1d229c804..bb0e0c3b4 100644
--- a/app/components/notifications-page/messages/nf-str-url-upldfailpay2/index.hbs
+++ b/app/components/notifications-page/messages/nf-str-url-upldfailpay2/index.hbs
@@ -10,15 +10,16 @@
   </AkTypography>
 
   <div data-test-nf-str-url-upldfailpay2-link>
-    <AkLink
+    <AkButton
+      @tag='a'
+      @variant='text'
       @color='primary'
       @underline='always'
       target='_blank'
       href={{@context.store_url}}
       rel='noopener noreferrer'
-      @title={{t 'notificationModule.viewAppOnStore'}}
     >
       {{t 'notificationModule.viewAppOnStore'}}
-    </AkLink>
+    </AkButton>
   </div>
 </AkStack>
\ No newline at end of file
diff --git a/app/components/notifications-page/messages/nf-str-url-upldfailpayrq1/index.hbs b/app/components/notifications-page/messages/nf-str-url-upldfailpayrq1/index.hbs
index 5cc9f2358..36dce4cf1 100644
--- a/app/components/notifications-page/messages/nf-str-url-upldfailpayrq1/index.hbs
+++ b/app/components/notifications-page/messages/nf-str-url-upldfailpayrq1/index.hbs
@@ -8,15 +8,16 @@
   </AkTypography>
 
   <div data-test-nf-str-url-upldfailpayrq1-link>
-    <AkLink
+    <AkButton
+      @tag='a'
+      @variant='text'
       @color='primary'
       @underline='always'
       target='_blank'
       href={{@context.store_url}}
       rel='noopener noreferrer'
-      @title={{t 'notificationModule.viewAppOnStore'}}
     >
       {{t 'notificationModule.viewAppOnStore'}}
-    </AkLink>
+    </AkButton>
   </div>
 </AkStack>
\ No newline at end of file
diff --git a/app/components/notifications-page/messages/nf-str-url-upload-success/index.hbs b/app/components/notifications-page/messages/nf-str-url-upload-success/index.hbs
index efcda28d1..876628914 100644
--- a/app/components/notifications-page/messages/nf-str-url-upload-success/index.hbs
+++ b/app/components/notifications-page/messages/nf-str-url-upload-success/index.hbs
@@ -35,15 +35,16 @@
   </AkTypography>
 
   <div data-test-nf-str-url-upload-success-link>
-    <AkLink
+    <AkButton
+      @tag='a'
+      @variant='text'
       @color='primary'
       @underline='always'
       target='_blank'
       href={{@context.store_url}}
       rel='noopener noreferrer'
-      @title={{t 'notificationModule.viewAppOnStore'}}
     >
       {{t 'notificationModule.viewAppOnStore'}}
-    </AkLink>
+    </AkButton>
   </div>
 </AkStack>
\ No newline at end of file
diff --git a/app/components/notifications-page/messages/nf-str-url-vldtn-err/index.hbs b/app/components/notifications-page/messages/nf-str-url-vldtn-err/index.hbs
index 10868bccf..56c5c3a6d 100644
--- a/app/components/notifications-page/messages/nf-str-url-vldtn-err/index.hbs
+++ b/app/components/notifications-page/messages/nf-str-url-vldtn-err/index.hbs
@@ -25,15 +25,16 @@
   </div>
 
   <div data-test-nf-str-url-vldtn-err-link>
-    <AkLink
+    <AkButton
+      @tag='a'
+      @variant='text'
       @color='primary'
       @underline='always'
       target='_blank'
       href={{@context.store_url}}
       rel='noopener noreferrer'
-      @title={{t 'notificationModule.viewAppOnStore'}}
     >
       {{t 'notificationModule.viewAppOnStore'}}
-    </AkLink>
+    </AkButton>
   </div>
 </AkStack>
\ No newline at end of file
diff --git a/app/components/notifications-page/namespace-message/index.hbs b/app/components/notifications-page/namespace-message/index.hbs
index 1807ce3a1..71c6cd0a9 100644
--- a/app/components/notifications-page/namespace-message/index.hbs
+++ b/app/components/notifications-page/namespace-message/index.hbs
@@ -56,17 +56,18 @@
       {{/if}}
 
       {{#if @context.store_url}}
-        <AkLink
+        <AkButton
           data-test-namespaceMessage-viewAppOnStorelink
+          @tag='a'
+          @variant='text'
           @color={{unless this.isUnModerated 'primary'}}
           @underline='always'
           target='_blank'
           href={{@context.store_url}}
           rel='noopener noreferrer'
-          @title={{t 'notificationModule.viewAppOnStore'}}
         >
           {{t 'notificationModule.viewAppOnStore'}}
-        </AkLink>
+        </AkButton>
       {{/if}}
     </AkStack>
   {{/if}}