diff --git a/pages/admin/tenants/_form.phtml b/pages/admin/tenants/_form.phtml
index ff3c05f..c0fcb96 100644
--- a/pages/admin/tenants/_form.phtml
+++ b/pages/admin/tenants/_form.phtml
@@ -353,7 +353,7 @@ $openOverrideCard = $detailsOpenAll;
                   <small class="muted"><?php e(t('One option per line. Optional format: key|Label.')); ?></small>
                 </label>
               </div>
-              <button type="submit" class="primary" form="tenant-custom-field-create-form" <?php e($disabledAttr); ?>>
+              <button type="submit" class="app-action-success" form="tenant-custom-field-create-form" <?php e($disabledAttr); ?>>
                 <?php e(t('Add custom field')); ?>
               </button>
             </div>
@@ -468,7 +468,7 @@ $openOverrideCard = $detailsOpenAll;
                 </div>
                 <hr>
                 <div class="grid">
-                  <button type="submit" class="primary" form="<?php e($updateFormId); ?>" <?php e($disabledAttr); ?>>
+                  <button type="submit" class="app-action-success" form="<?php e($updateFormId); ?>" <?php e($disabledAttr); ?>>
                     <?php e(t('Save')); ?>
                   </button>
                   <button type="submit" class="danger" form="<?php e($deleteFormId); ?>" <?php e($disabledAttr); ?>>
diff --git a/pages/admin/tenants/edit(default).phtml b/pages/admin/tenants/edit(default).phtml
index 44bccd3..09a053c 100644
--- a/pages/admin/tenants/edit(default).phtml
+++ b/pages/admin/tenants/edit(default).phtml
@@ -113,7 +113,7 @@ $hasFavicon = $avatarUuid !== '' && $tenantFaviconService->hasFavicon($avatarUui
               <input type="file" name="avatar" accept="image/*">
             </label>
             <div class="grid">
-              <button type="submit" class="primary">
+              <button type="submit" class="app-action-success">
                 <?php e(t('Save')); ?>
               </button>
               <?php if ($hasAvatar): ?>
@@ -152,7 +152,7 @@ $hasFavicon = $avatarUuid !== '' && $tenantFaviconService->hasFavicon($avatarUui
               <input type="file" name="favicon" accept="image/png">
             </label>
             <div class="grid">
-              <button type="submit" class="primary">
+              <button type="submit" class="app-action-success">
                 <?php e(t('Save')); ?>
               </button>
               <?php if ($hasFavicon): ?>
diff --git a/pages/admin/users/edit(default).phtml b/pages/admin/users/edit(default).phtml
index e770c3b..eb52c87 100644
--- a/pages/admin/users/edit(default).phtml
+++ b/pages/admin/users/edit(default).phtml
@@ -265,7 +265,7 @@ if ($lastLoginAt !== '') {
               <input type="file" name="avatar" accept="image/*">
             </label>
             <div class="grid">
-              <button type="submit" class="primary">
+              <button type="submit" class="app-action-success">
                 <?php e(t('Save')); ?>
               </button>
               <?php if ($hasAvatar): ?>
diff --git a/pages/page/index(default).phtml b/pages/page/index(default).phtml
index 8f1d8a8..db3c7cf 100644
--- a/pages/page/index(default).phtml
+++ b/pages/page/index(default).phtml
@@ -64,7 +64,7 @@
               <i class="bi bi-pencil-square" data-editor-icon aria-hidden="true"></i>
             <?php endif; ?>
           </button>
-          <button type="submit" form="page-editor" class="primary" data-editor-save>
+          <button type="submit" form="page-editor" class="app-action-success" data-editor-save>
             <?php e(t('Save')); ?>
           </button>
         </div>
diff --git a/pages/public-page/index(page).phtml b/pages/public-page/index(page).phtml
index 0c519e7..792fa6e 100644
--- a/pages/public-page/index(page).phtml
+++ b/pages/public-page/index(page).phtml
@@ -64,7 +64,7 @@
               <i class="bi bi-pencil-square" data-editor-icon aria-hidden="true"></i>
             <?php endif; ?>
           </button>
-          <button type="submit" form="page-editor" class="primary" data-editor-save>
+          <button type="submit" form="page-editor" class="app-action-success" data-editor-save>
             <?php e(t('Save')); ?>
           </button>
         </div>