diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/detail.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/detail.xhtml
index 727d0dc..a47fb2f 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/detail.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/detail.xhtml
@@ -32,10 +32,10 @@
                         </div>
                     </div>
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Retour à la liste"/>
                             <ui:param name="icon" value="pi pi-arrow-left"/>
-                            <ui:param name="outcome" value="/pages/secure/organisation/liste.xhtml"/>
+                            <ui:param name="outcome" value="/pages/secure/organisation/liste"/>
                         </ui:include>
                     </div>
                 </div>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/nouvelle.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/nouvelle.xhtml
index 2a0b24b..61bf7a4 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/nouvelle.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/nouvelle.xhtml
@@ -24,7 +24,7 @@
                         </span>
                     </div>
                     <div class="flex gap-2">
-                        <ui:include src="/templates/components/button-secondary.xhtml">
+                        <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                             <ui:param name="value" value="Annuler"/>
                             <ui:param name="icon" value="pi pi-times"/>
                             <ui:param name="outcome" value="/pages/secure/organisation/liste"/>
@@ -42,18 +42,16 @@
             </div>
 
             <div class="mt-3 flex justify-content-end gap-2">
-                <ui:include src="/templates/components/button-secondary.xhtml">
+                <ui:include src="/templates/components/buttons/button-secondary.xhtml">
                     <ui:param name="value" value="Annuler"/>
                     <ui:param name="icon" value="pi pi-times"/>
                     <ui:param name="outcome" value="/pages/secure/organisation/liste"/>
                 </ui:include>
-                <ui:include src="/templates/components/button-success.xhtml">
-                    <ui:param name="value" value="Créer"/>
-                    <ui:param name="icon" value="pi pi-check"/>
-                    <ui:param name="action" value="#{organisationsBean.creerOrganisation}"/>
-                    <ui:param name="update" value=":formNouvelleOrganisation:messages"/>
-                    <ui:param name="onclick" value=""/>
-                </ui:include>
+                <p:commandButton value="Créer"
+                               icon="pi pi-check"
+                               action="#{organisationsBean.creerOrganisation}"
+                               update=":formNouvelleOrganisation:messages"
+                               styleClass="ui-button-success" />
             </div>
         </h:form>
     </ui:define>