diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-icon.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-icon.xhtml
index 9d42a88..a32a4c1 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-icon.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-icon.xhtml
@@ -21,11 +21,10 @@
         <p:commandButton 
             icon="#{icon}"
             action="#{action}"
-            actionListener="#{actionListener}"
             update="#{update}"
             onclick="#{onclick}"
             disabled="#{not empty disabled and disabled}"
-            styleClass="#{not empty rounded and rounded ? 'ui-button-rounded' : ''} #{not empty text and text ? 'ui-button-text' : ''} #{not empty severity ? 'ui-button-' += severity : ''} #{styleClass}"
+            styleClass="#{not empty rounded and rounded ? 'ui-button-rounded' : ''} #{not empty text and text ? 'ui-button-text' : ''} #{not empty severity ? 'ui-button-' += severity : ''} #{not empty styleClass ? styleClass : ''}"
             title="#{title}" />
     </ui:fragment>
 </ui:composition>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-info.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-info.xhtml
index d3fd104..7593915 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-info.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-info.xhtml
@@ -14,11 +14,10 @@
                 value="#{value}"
                 icon="#{icon}"
                 action="#{action}"
-                actionListener="#{actionListener}"
                 update="#{update}"
                 onclick="#{onclick}"
                 disabled="#{not empty disabled and disabled}"
-                styleClass="ui-button-info #{not empty outlined and outlined ? 'ui-button-outlined' : ''} #{styleClass}"
+                styleClass="ui-button-info #{not empty outlined and outlined ? 'ui-button-outlined' : ''} #{not empty styleClass ? styleClass : ''}"
                 title="#{title}" />
         </ui:fragment>
         <ui:fragment rendered="#{not empty outcome}">
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-primary.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-primary.xhtml
index 334c706..47d3707 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-primary.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-primary.xhtml
@@ -24,11 +24,10 @@
                 value="#{value}"
                 icon="#{icon}"
                 action="#{action}"
-                actionListener="#{actionListener}"
                 update="#{update}"
                 onclick="#{onclick}"
                 disabled="#{not empty disabled and disabled}"
-                styleClass="ui-button-primary #{styleClass}"
+                styleClass="ui-button-primary #{not empty styleClass ? styleClass : ''}"
                 title="#{title}" />
         </ui:fragment>
         <ui:fragment rendered="#{not empty outcome}">
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-warning.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-warning.xhtml
index 531df4f..5133af9 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-warning.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/templates/components/buttons/button-warning.xhtml
@@ -14,11 +14,10 @@
                 value="#{value}"
                 icon="#{icon}"
                 action="#{action}"
-                actionListener="#{actionListener}"
                 update="#{update}"
                 onclick="#{onclick}"
                 disabled="#{not empty disabled and disabled}"
-                styleClass="ui-button-warning #{not empty outlined and outlined ? 'ui-button-outlined' : ''} #{styleClass}"
+                styleClass="ui-button-warning #{not empty outlined and outlined ? 'ui-button-outlined' : ''} #{not empty styleClass ? styleClass : ''}"
                 title="#{title}" />
         </ui:fragment>
         <ui:fragment rendered="#{not empty outcome}">