diff --git a/app/assets/stylesheets/table_service.scss b/app/assets/stylesheets/table_service.scss
index bf7e9d67f..5e868662a 100644
--- a/app/assets/stylesheets/table_service.scss
+++ b/app/assets/stylesheets/table_service.scss
@@ -2,8 +2,8 @@
 
 .table-service {
   .change {
-    text-align: center;
-    width: 200px;
+    text-align: left;
+    width: 300px;
     padding-left: $default-padding;
   }
 }
diff --git a/app/views/administrateurs/services/index.html.haml b/app/views/administrateurs/services/index.html.haml
index cc4f14cf3..2267bf485 100644
--- a/app/views/administrateurs/services/index.html.haml
+++ b/app/views/administrateurs/services/index.html.haml
@@ -4,25 +4,14 @@
                     'Choix du service'] }
 
 #services-index.container
-  %h1 Choix du service pour la démarche
-
-  = form_for @procedure,  url: { controller: "administrateurs/services", action: :add_to_procedure } , html: { class: 'form' } do |f|
-    = f.label :service_id, "La démarche #{@procedure.libelle} est affectée au service"
-    = f.select :service_id,
-      @services.map { |s| [ s.nom, s.id ] },
-      { prompt: 'choisir un service', selected: @procedure.service&.id },
-      required: true
-
-    = f.hidden_field :id
-    = f.submit 'valider', class: 'button primary'
-
   %h1 Liste des Services
+  %h2 La démarche #{@procedure.libelle} peut être affectée aux services dans la liste ci-dessous
 
   %table.table.table-service.hoverable
     %thead
       %tr
         %th
-          nom
+          Nom
         %th.change
           = link_to('Nouveau service', new_admin_service_path(procedure_id: @procedure.id), class: 'button')
 
@@ -32,8 +21,14 @@
           %td
             = service.nom
           %td.change
-            = link_to('modifier', edit_admin_service_path(service, procedure_id: @procedure.id))
-            = link_to 'supprimer',
-              admin_service_path(service, procedure_id: @procedure.id),
-              method: :delete,
-              data: { confirm: "Confirmez vous la suppression de #{service.nom}" }
+            - if @procedure.service == service
+              %strong.mr-2 (Assigné)
+            - else
+              = button_to "Assigner", add_to_procedure_admin_services_path(procedure: { id: @procedure.id, service_id: service.id, }), method: :patch, class: 'link mr-2', form_class: 'inline'
+            = link_to('Modifier', edit_admin_service_path(service, procedure_id: @procedure.id), class: 'link my-2')
+            - if @procedure.service != service
+              = link_to 'Supprimer',
+                admin_service_path(service, procedure_id: @procedure.id),
+                method: :delete,
+                data: { confirm: "Confirmez vous la suppression de #{service.nom}" },
+                class: 'btn btn-link ml-2'
diff --git a/spec/system/administrateurs/procedure_cloning_spec.rb b/spec/system/administrateurs/procedure_cloning_spec.rb
index 48a3a9533..569481a3c 100644
--- a/spec/system/administrateurs/procedure_cloning_spec.rb
+++ b/spec/system/administrateurs/procedure_cloning_spec.rb
@@ -27,8 +27,7 @@ describe 'As an administrateur I wanna clone a procedure', js: true do
 
       # select service
       find("#service .button").click
-      within("#procedure_service_id") { select(administrateur.services.first.nom) }
-      click_on("valider")
+      click_on "Assigner"
 
       # then publish
       find('#publish-procedure-link').click