diff --git a/machines/templates/machines/aff_extension.html b/machines/templates/machines/aff_extension.html
index 15a4c637..d2fca481 100644
--- a/machines/templates/machines/aff_extension.html
+++ b/machines/templates/machines/aff_extension.html
@@ -45,9 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ extension.origin_v6 }}</td>
             {% endif %}
             <td class="text-right">
-            {% if is_infra %}
                 {% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}
-            {% endif %}
                 {% include 'buttons/history.html' with href='machines:history' name='extension' id=extension.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_iptype.html b/machines/templates/machines/aff_iptype.html
index 454b169d..dc50cd4c 100644
--- a/machines/templates/machines/aff_iptype.html
+++ b/machines/templates/machines/aff_iptype.html
@@ -48,9 +48,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ type.vlan }}</td>
 	    <td>{{ type.ouverture_ports }}</td>
             <td class="text-right">
-            {% if is_infra %}
                 {% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %}
-            {% endif %}
                 {% include 'buttons/history.html' with href='machines:history' name='iptype' id=type.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_machinetype.html b/machines/templates/machines/aff_machinetype.html
index 7fdcbdb4..44070dc6 100644
--- a/machines/templates/machines/aff_machinetype.html
+++ b/machines/templates/machines/aff_machinetype.html
@@ -35,9 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ type.type }}</td>
             <td>{{ type.ip_type }}</td>
             <td class="text-right">
-            {% if is_infra %}
                 {% include 'buttons/edit.html' with href='machines:edit-machinetype' id=type.id %}
-            {% endif %}
                 {% include 'buttons/history.html' with href='machines:history' name='machinetype' id=type.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_mx.html b/machines/templates/machines/aff_mx.html
index 176ab061..8c27bbfd 100644
--- a/machines/templates/machines/aff_mx.html
+++ b/machines/templates/machines/aff_mx.html
@@ -38,9 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	    <td>{{ mx.priority }}</td>
 	    <td>{{ mx.name }}</td>
             <td class="text-right">
-            {% if is_infra %}
             {% include 'buttons/edit.html' with href='machines:edit-mx' id=mx.id %}
-            {% endif %}
             {% include 'buttons/history.html' with href='machines:history' name='mx' id=mx.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_nas.html b/machines/templates/machines/aff_nas.html
index dc8fd079..670ef893 100644
--- a/machines/templates/machines/aff_nas.html
+++ b/machines/templates/machines/aff_nas.html
@@ -41,9 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	    <td>{{ nas.port_access_mode }}</td>
 	    <td>{{ nas.autocapture_mac }}</td>
 	    <td class="text-right">
-            {% if is_infra %}
                 {% include 'buttons/edit.html' with href='machines:edit-nas' id=nas.id %}
-            {% endif %}
                 {% include 'buttons/history.html' with href='machines:history' name='nas' id=nas.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_ns.html b/machines/templates/machines/aff_ns.html
index 67a0dd81..d1157c52 100644
--- a/machines/templates/machines/aff_ns.html
+++ b/machines/templates/machines/aff_ns.html
@@ -36,9 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ ns.zone }}</td>
 	    <td>{{ ns.ns }}</td>
             <td class="text-right">
-            {% if is_infra %}
             {% include 'buttons/edit.html' with href='machines:edit-ns' id=ns.id %}
-            {% endif %}
             {% include 'buttons/history.html' with href='machines:history' name='ns' id=ns.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_service.html b/machines/templates/machines/aff_service.html
index 47bfee25..e8a228da 100644
--- a/machines/templates/machines/aff_service.html
+++ b/machines/templates/machines/aff_service.html
@@ -40,9 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ service.regular_time_regen }}</td>
 	    <td>{% for serv in service.servers.all %}{{ serv }}, {% endfor %}</td>
             <td class="text-right">
-            {% if is_infra %}
                 {% include 'buttons/edit.html' with href='machines:edit-service' id=service.id %}
-            {% endif %}
                 {% include 'buttons/history.html' with href='machines:history' name='service' id=service.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_soa.html b/machines/templates/machines/aff_soa.html
index 3dad11c7..3386ed2d 100644
--- a/machines/templates/machines/aff_soa.html
+++ b/machines/templates/machines/aff_soa.html
@@ -44,9 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	    <td>{{ soa.expire }}</td>
 	    <td>{{ soa.ttl }}</td>
             <td class="text-right">
-            {% if is_infra %}
             {% include 'buttons/edit.html' with href='machines:edit-soa' id=soa.id %}
-            {% endif %}
             {% include 'buttons/history.html' with href='machines:history' name='soa' id=soa.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_srv.html b/machines/templates/machines/aff_srv.html
index 773815d9..039df718 100644
--- a/machines/templates/machines/aff_srv.html
+++ b/machines/templates/machines/aff_srv.html
@@ -48,9 +48,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	    <td>{{ srv.port }}</td>
 	    <td>{{ srv.target }}</td>
 	    <td class="text-right">
-            {% if is_infra %}
             {% include 'buttons/edit.html' with href='machines:edit-srv' id=srv.id %}
-            {% endif %}
             {% include 'buttons/history.html' with href='machines:history' name='srv' id=srv.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_txt.html b/machines/templates/machines/aff_txt.html
index fd7c5ee6..053cb239 100644
--- a/machines/templates/machines/aff_txt.html
+++ b/machines/templates/machines/aff_txt.html
@@ -36,9 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	    <td>{{ txt.zone }}</td>
 	    <td>{{ txt.dns_entry }}</td>
             <td class="text-right">
-            {% if is_infra %}
             {% include 'buttons/edit.html' with href='machines:edit-txt' id=txt.id %}
-            {% endif %}
             {% include 'buttons/history.html' with href='machines:history' name='txt' id=txt.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/aff_vlan.html b/machines/templates/machines/aff_vlan.html
index eaa1c82c..3245d877 100644
--- a/machines/templates/machines/aff_vlan.html
+++ b/machines/templates/machines/aff_vlan.html
@@ -39,9 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	    <td>{{ vlan.comment }}</td>
             <td>{% for range in vlan.iptype_set.all %}{{ range }}, {% endfor%}</td>
 	    <td class="text-right">
-            {% if is_infra %}
                 {% include 'buttons/edit.html' with href='machines:edit-vlan' id=vlan.id %}
-            {% endif %}
                 {% include 'buttons/history.html' with href='machines:history' name='vlan' id=vlan.id %}
             </td>
         </tr>
diff --git a/machines/templates/machines/index_extension.html b/machines/templates/machines/index_extension.html
index 3169b4c9..5f8d1bd2 100644
--- a/machines/templates/machines/index_extension.html
+++ b/machines/templates/machines/index_extension.html
@@ -29,41 +29,29 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
   <h2>Liste des extensions</h2>
-  {% if is_infra %}
   <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-extension'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter une extension</a>
   <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-extension'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer une ou plusieurs extensions</a>
-  {% endif %}
   {%  include "machines/aff_extension.html" with  extension_list=extension_list %}
 
   <h2>Liste des enregistrements SOA</h2>
-   {% if is_infra %}
    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-soa'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un enregistrement SOA</a>
    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-soa'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un enregistrement SOA</a>
-   {% endif %}
    {%  include "machines/aff_soa.html" with  soa_list=soa_list %}
   <h2>Liste des enregistrements MX</h2>
-   {% if is_infra %}
    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-mx'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un enregistrement MX</a>
    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-mx'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un enregistrement MX</a>
-   {% endif %}
    {%  include "machines/aff_mx.html" with  mx_list=mx_list %}
   <h2>Liste des enregistrements NS</h2>
-   {% if is_infra %}
    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-ns'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un enregistrement NS</a>
    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-ns'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un enregistrement NS</a>
-   {% endif %}
    {%  include "machines/aff_ns.html" with  ns_list=ns_list %}
   <h2>Liste des enregistrements TXT</h2>
-   {% if is_infra %}
    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-txt'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un enregistrement TXT</a>
    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-txt'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un enregistrement TXT</a>
-   {% endif %}
    {%  include "machines/aff_txt.html" with  txt_list=txt_list %}
   <h2>Liste des enregistrements SRV</h2>
-   {% if is_infra %}
    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-srv'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un enregistrement SRV</a>
    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-srv'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un enregistrement SRV</a>
-   {% endif %}
    {%  include "machines/aff_srv.html" with  srv_list=srv_list %}
    <br />
   <br />
diff --git a/machines/templates/machines/index_iptype.html b/machines/templates/machines/index_iptype.html
index 8f85130b..10bb2079 100644
--- a/machines/templates/machines/index_iptype.html
+++ b/machines/templates/machines/index_iptype.html
@@ -29,10 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
   <h2>Liste des types d'ip</h2>
-  {% if is_infra %}
   <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-iptype'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un type d'ip</a>
   <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-iptype'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un ou plusieurs types d'ip</a>
-  {% endif %}
   {%  include "machines/aff_iptype.html" with  iptype_list=iptype_list %}
   <br />
   <br />
diff --git a/machines/templates/machines/index_machinetype.html b/machines/templates/machines/index_machinetype.html
index 1e99fd2d..75399aba 100644
--- a/machines/templates/machines/index_machinetype.html
+++ b/machines/templates/machines/index_machinetype.html
@@ -29,10 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
   <h2>Liste des types de machines</h2>
-  {% if is_infra %}
   <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-machinetype'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un type de machine</a>
   <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-machinetype'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un ou plusieurs types de machines</a>
-  {% endif %}
   {%  include "machines/aff_machinetype.html" with  machinetype_list=machinetype_list %}
   <br />
   <br />
diff --git a/machines/templates/machines/index_nas.html b/machines/templates/machines/index_nas.html
index ac1fe8b4..16fb29e2 100644
--- a/machines/templates/machines/index_nas.html
+++ b/machines/templates/machines/index_nas.html
@@ -31,10 +31,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   <h2>Liste des nas</h2>
   <h5>La correpondance nas-machinetype relie le type de nas à un type de machine.
   Elle est utile pour l'autoenregistrement des macs par radius, et permet de choisir le type de machine à affecter aux machines en fonction du type de nas</h5>
-  {% if is_infra %}
   <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-nas' %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un type de nas</a>
   <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-nas'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un ou plusieurs types nas</a>
-  {% endif %}
   {%  include "machines/aff_nas.html" with  nas_list=nas_list %}
   <br />
   <br />
diff --git a/machines/templates/machines/index_service.html b/machines/templates/machines/index_service.html
index b07f994c..1fa917f3 100644
--- a/machines/templates/machines/index_service.html
+++ b/machines/templates/machines/index_service.html
@@ -29,10 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
   <h2>Liste des services</h2>
-  {% if is_infra %}
   <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-service'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un service</a>
   <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-service'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un ou plusieurs service</a>
-  {% endif %}
   {%  include "machines/aff_service.html" with  service_list=service_list %}
   <h2>Etat des serveurs</h2>
   {%  include "machines/aff_servers.html" with  servers_list=servers_list %}
diff --git a/machines/templates/machines/index_vlan.html b/machines/templates/machines/index_vlan.html
index ec00b0bf..ccbfa753 100644
--- a/machines/templates/machines/index_vlan.html
+++ b/machines/templates/machines/index_vlan.html
@@ -29,10 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
   <h2>Liste des vlans</h2>
-  {% if is_infra %}
   <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-vlan' %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un vlan</a>
   <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-vlan'  %}"><i class="glyphicon glyphicon-trash"></i> Supprimer un ou plusieurs vlan</a>
-  {% endif %}
   {%  include "machines/aff_vlan.html" with  vlan_list=vlan_list %}
   <br />
   <br />
diff --git a/machines/templates/machines/sidebar.html b/machines/templates/machines/sidebar.html
index 6ca3a07f..355d5147 100644
--- a/machines/templates/machines/sidebar.html
+++ b/machines/templates/machines/sidebar.html
@@ -23,42 +23,55 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 {% endcomment %}
 
+{% load acl %}
 
 {% block sidebar %}
-    {% if is_cableur %}
+    {% can_view_all Machine %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index" %}">
         <i class="glyphicon glyphicon-list"></i>
         Machines
     </a>
+    {% acl_end %}
+    {% can_view_all MachineType %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-machinetype" %}">
         <i class="glyphicon glyphicon-list"></i>
         Types de machines
     </a>
+    {% acl_end %}
+    {% can_view_all Extension %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-extension" %}">
         <i class="glyphicon glyphicon-list"></i>
         Extensions et zones
     </a>
+    {% acl_end %}
+    {% can_view_all IpType %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-iptype" %}">
         <i class="glyphicon glyphicon-list"></i>
         Plages d'IP
     </a>
+    {% acl_end %}
+    {% can_view_all Vlan %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-vlan" %}">
         <i class="glyphicon glyphicon-list"></i>
         Vlans
     </a>
+    {% acl_end %}
+    {% can_view_all Nas %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-nas" %}">
         <i class="glyphicon glyphicon-list"></i>
         Gestion des nas
     </a>
+    {% acl_end %}
+    {% can_view_all Service %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-service" %}">
         <i class="glyphicon glyphicon-list"></i>
         Services (dhcp, dns...)
-    </a>   
-    {% endif %}
-    {% if is_cableur %}
+    </a>
+    {% acl_end %}
+    {% can_view_all OuverturePortList %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-portlist" %}">
         <i class="glyphicon glyphicon-list"></i>
         Ouverture de ports
     </a>   
-    {%endif%}
+    {% acl_end %}
 {% endblock %}