diff --git a/client/web/compose/src/components/PageBlocks/Shared/AutomationTabButtonEditor.vue b/client/web/compose/src/components/PageBlocks/Shared/AutomationTabButtonEditor.vue
index 58725dcaf..291c51f62 100644
--- a/client/web/compose/src/components/PageBlocks/Shared/AutomationTabButtonEditor.vue
+++ b/client/web/compose/src/components/PageBlocks/Shared/AutomationTabButtonEditor.vue
@@ -1,10 +1,10 @@
 <template>
   <b-card
-    :header="workflow ? $t('automation.editTitle.workflow') : $t('automation.editTitle.script')"
+    :header="workflow ? $t('editTitle.workflow') : $t('editTitle.script')"
     footer-class="text-right"
   >
     <b-form-group
-      :label="$t('automation.buttonLabel')"
+      :label="$t('buttonLabel')"
     >
       <b-input-group>
         <b-form-input
@@ -14,7 +14,7 @@
     </b-form-group>
 
     <b-form-group
-      :label="$t('automation.buttonVariant')"
+      :label="$t('buttonVariant')"
     >
       <b-select
         v-model="button.variant"
@@ -35,7 +35,7 @@
       v-if="workflow"
     >
       <h5>
-        {{ workflow.meta.name || $t('automation.noLabel') }}
+        {{ workflow.meta.name || $t('noLabel') }}
       </h5>
     </div>
 
@@ -50,27 +50,29 @@
       show
       variant="warning"
     >
-      {{ $t('automation.noScript' ) }}
+      {{ $t('noScript' ) }}
     </b-alert>
 
     <p
       v-if="workflow && workflow.meta"
       class="my-2"
     >
-      {{ workflow.meta.description || $t('automation.noDescription') }}
+      {{ workflow.meta.description || $t('noDescription') }}
+
+      <var
+        v-if="trigger"
+      >
+        {{ $t('stepID', { stepID: trigger.stepID }) }}
+      </var>
     </p>
 
     <p
       v-else-if="script"
       class="my-2"
     >
-      {{ script.description || $t('automation.noDescription') }}
+      {{ script.description || $t('noDescription') }}
     </p>
 
-    <var>
-      {{ $t('automation.stepID', { stepID: trigger.stepID }) }}
-    </var>
-
     <template #footer>
       <c-input-confirm
         variant="link-light"
@@ -85,6 +87,7 @@ import { compose, NoID } from '@cortezaproject/corteza-js'
 export default {
   i18nOptions: {
     namespaces: 'block',
+    keyPrefix: 'automation',
   },
 
   props: {
@@ -126,7 +129,7 @@ export default {
         'success',
         'danger',
         'warning',
-      ].map(variant => ({ variant, label: this.$t(`${variant}Button`) }))
+      ].map(variant => ({ variant, label: this.$t(`variants.${variant}`) }))
     },
 
     workflow () {
diff --git a/lib/js/src/compose/types/page-block/types.ts b/lib/js/src/compose/types/page-block/types.ts
index 4567056c8..5a86ea27e 100644
--- a/lib/js/src/compose/types/page-block/types.ts
+++ b/lib/js/src/compose/types/page-block/types.ts
@@ -17,7 +17,7 @@ export class Button {
   public label?: string = undefined;
 
   // can override hook's variant
-  public variant?: string = undefined;
+  public variant?: string = 'primary';
 
   public enabled = true;
 
diff --git a/locale/en/corteza-webapp-compose/block.yaml b/locale/en/corteza-webapp-compose/block.yaml
index b5cf4c837..6168dadb4 100644
--- a/locale/en/corteza-webapp-compose/block.yaml
+++ b/locale/en/corteza-webapp-compose/block.yaml
@@ -7,26 +7,27 @@ automation:
   buttonLabel: Label
   buttonVariant: Variant
   configuredButtons: Configured buttons
-  dangerButton: Danger
-  darkButton: Dark
   dummyButtonLabel: Dummy
   editButton: Edit
   editTitle:
     script: Edit automation script button
     workflow: Edit workflow button
   label: Automation
-  lightButton: Light
   noDescription: No description
   noLabel: Unlabeled
   noScript: There is no script or workflow configured for this button
   noScripts: There are no manual scripts compatible with this page block
-  primaryButton: Primary
   removeAll: Remove all
   searchPlaceholder: Filter available scripts by label, script name and description
-  secondaryButton: Secondary
   stepID: 'Starting step ID: {{stepID}}'
-  successButton: Success
-  warningButton: Warning
+  variants:
+    primary: Primary
+    secondary: Secondary
+    light: Light
+    dark: Dark
+    success: Success
+    danger: Danger
+    warning: Warning
 calendar:
   addEventsSource: Add events source
   calendarHeader: Calendar header