diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/liste.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/liste.xhtml
index b39ca42..d5cf72e 100644
--- a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/liste.xhtml
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/pages/secure/organisation/liste.xhtml
@@ -3,7 +3,8 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html"
       xmlns:f="http://xmlns.jcp.org/jsf/core"
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:p="http://primefaces.org/ui">
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:uf="http://xmlns.jcp.org/jsf/composite/components">
 
 <ui:composition template="/templates/main-template.xhtml">
     <ui:define name="title">Gestion des Organisations</ui:define>
@@ -174,32 +175,23 @@
                                 <ui:param name="styleClass" value="mr-2"/>
                             </ui:include>
                                            
-                            <p:commandButton value="Modifier"
-                                           icon="pi pi-pencil"
-                                           actionListener="#{organisationsBean.setOrganisationSelectionnee(org)}"
-                                           oncomplete="PF('dlgModifier').show();"
-                                           update=":formModifier"
-                                           styleClass="ui-button-rounded ui-button-text ui-button-warning mr-2"/>
-                                           
-                            <p:commandButton value="#{org.statut == organisationsBean.statutActive ? 'Désactiver' : 'Activer'}"
-                                           icon="#{org.statut == organisationsBean.statutActive ? 'pi pi-ban' : 'pi pi-check'}"
-                                           actionListener="#{organisationsBean.basculerStatutOrganisation(org)}"
-                                           update=":formOrganisations:dtOrganisations :formOrganisations:messages"
-                                           styleClass="ui-button-rounded ui-button-text #{org.statut == organisationsBean.statutActive ? 'ui-button-secondary' : 'ui-button-success'} mr-2">
-                                <p:confirm header="Confirmation"
-                                         message="Êtes-vous sûr de vouloir changer le statut de cette organisation ?"
-                                         icon="pi pi-exclamation-triangle"/>
-                            </p:commandButton>
+                            <!-- DRY/WOU: Composite Component action-button-edit -->
+                            <uf:action-button-edit actionListener="#{organisationsBean.setOrganisationSelectionnee(org)}"
+                                                 update=":formModifier"
+                                                 dialogWidget="dlgModifier"
+                                                 styleClass="mr-2"/>
                             
-                            <p:commandButton value="Supprimer"
-                                           icon="pi pi-trash"
-                                           actionListener="#{organisationsBean.supprimerOrganisation(org)}"
-                                           update=":formOrganisations:dtOrganisations :formOrganisations:messages"
-                                           styleClass="ui-button-rounded ui-button-text ui-button-danger">
-                                <p:confirm header="Confirmation"
-                                         message="Êtes-vous sûr de vouloir supprimer cette organisation ? Cette action est irréversible."
-                                         icon="pi pi-exclamation-triangle"/>
-                            </p:commandButton>
+                            <!-- DRY/WOU: Composite Component action-button-toggle -->
+                            <uf:action-button-toggle actionListener="#{organisationsBean.basculerStatutOrganisation(org)}"
+                                                   update=":formOrganisations:dtOrganisations :formOrganisations:messages"
+                                                   isActive="#{org.statut == organisationsBean.statutActive}"
+                                                   confirmMessage="Êtes-vous sûr de vouloir changer le statut de cette organisation ?"
+                                                   styleClass="mr-2"/>
+                            
+                            <!-- DRY/WOU: Composite Component action-button-delete -->
+                            <uf:action-button-delete actionListener="#{organisationsBean.supprimerOrganisation(org)}"
+                                                   update=":formOrganisations:dtOrganisations :formOrganisations:messages"
+                                                   confirmMessage="Êtes-vous sûr de vouloir supprimer cette organisation ? Cette action est irréversible."/>
                         </p:column>
                     </p:dataTable>
                 </ui:define>
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/resources/components/action-button-delete.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/resources/components/action-button-delete.xhtml
new file mode 100644
index 0000000..1951c58
--- /dev/null
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/resources/components/action-button-delete.xhtml
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:composite="http://xmlns.jcp.org/jsf/composite"
+      xmlns:p="http://primefaces.org/ui">
+
+<composite:interface>
+    <composite:attribute name="actionListener" 
+                         method-signature="void actionListener(jakarta.faces.event.ActionEvent)" 
+                         required="true"/>
+    <composite:attribute name="update" type="java.lang.String" required="false"/>
+    <composite:attribute name="confirmMessage" type="java.lang.String" required="false" default="Êtes-vous sûr de vouloir supprimer ?"/>
+    <composite:attribute name="styleClass" type="java.lang.String" required="false" default=""/>
+</composite:interface>
+
+<composite:implementation>
+    <p:commandButton value="Supprimer"
+                   icon="pi pi-trash"
+                   actionListener="#{cc.attrs.actionListener}"
+                   update="#{cc.attrs.update}"
+                   styleClass="ui-button-rounded ui-button-text ui-button-danger #{cc.attrs.styleClass}">
+        <p:confirm header="Confirmation"
+                 message="#{cc.attrs.confirmMessage}"
+                 icon="pi pi-exclamation-triangle"/>
+    </p:commandButton>
+</composite:implementation>
+</html>
+
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/resources/components/action-button-edit.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/resources/components/action-button-edit.xhtml
new file mode 100644
index 0000000..be60050
--- /dev/null
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/resources/components/action-button-edit.xhtml
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:composite="http://xmlns.jcp.org/jsf/composite"
+      xmlns:p="http://primefaces.org/ui">
+
+<composite:interface>
+    <composite:attribute name="actionListener" 
+                         method-signature="void actionListener(jakarta.faces.event.ActionEvent)" 
+                         required="true"/>
+    <composite:attribute name="update" type="java.lang.String" required="false"/>
+    <composite:attribute name="dialogWidget" type="java.lang.String" required="true"/>
+    <composite:attribute name="styleClass" type="java.lang.String" required="false" default="mr-2"/>
+</composite:interface>
+
+<composite:implementation>
+    <p:commandButton value="Modifier"
+                   icon="pi pi-pencil"
+                   actionListener="#{cc.attrs.actionListener}"
+                   oncomplete="PF('#{cc.attrs.dialogWidget}').show();"
+                   update="#{cc.attrs.update}"
+                   styleClass="ui-button-rounded ui-button-text ui-button-warning #{cc.attrs.styleClass}"/>
+</composite:implementation>
+</html>
+
diff --git a/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/resources/components/action-button-toggle.xhtml b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/resources/components/action-button-toggle.xhtml
new file mode 100644
index 0000000..77fab92
--- /dev/null
+++ b/unionflow-client-quarkus-primefaces-freya/src/main/resources/META-INF/resources/resources/components/action-button-toggle.xhtml
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:composite="http://xmlns.jcp.org/jsf/composite"
+      xmlns:p="http://primefaces.org/ui">
+
+<composite:interface>
+    <composite:attribute name="actionListener" 
+                         method-signature="void actionListener(jakarta.faces.event.ActionEvent)" 
+                         required="true"/>
+    <composite:attribute name="update" type="java.lang.String" required="false"/>
+    <composite:attribute name="isActive" type="java.lang.Boolean" required="true"/>
+    <composite:attribute name="confirmMessage" type="java.lang.String" required="false" default="Êtes-vous sûr ?"/>
+    <composite:attribute name="styleClass" type="java.lang.String" required="false" default="mr-2"/>
+</composite:interface>
+
+<composite:implementation>
+    <p:commandButton value="#{cc.attrs.isActive ? 'Désactiver' : 'Activer'}"
+                   icon="#{cc.attrs.isActive ? 'pi pi-ban' : 'pi pi-check'}"
+                   actionListener="#{cc.attrs.actionListener}"
+                   update="#{cc.attrs.update}"
+                   styleClass="ui-button-rounded ui-button-text #{cc.attrs.isActive ? 'ui-button-secondary' : 'ui-button-success'} #{cc.attrs.styleClass}">
+        <p:confirm header="Confirmation"
+                 message="#{cc.attrs.confirmMessage}"
+                 icon="pi pi-exclamation-triangle"/>
+    </p:commandButton>
+</composite:implementation>
+</html>
+