diff --git a/cotisations/templates/cotisations/aff_article.html b/cotisations/templates/cotisations/aff_article.html
index c238ba13..6951e4e6 100644
--- a/cotisations/templates/cotisations/aff_article.html
+++ b/cotisations/templates/cotisations/aff_article.html
@@ -15,7 +15,7 @@
             <td>{{ article.cotisation }}</td>
             <td>{{ article.duration }}</td>
             <td>{% if is_trez %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:edit-article' article.id %}"><i class="glyphicon glyphicon-pushpin"></i> Editer</a>{% endif %}
-            <a class="btn btn-info btn-sm" role="button" href="{% url 'cotisations:history' 'article' article.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <a class="btn btn-info btn-sm" role="button" href="{% url 'cotisations:history' 'article' article.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/cotisations/templates/cotisations/aff_banque.html b/cotisations/templates/cotisations/aff_banque.html
index 5e2c0eee..4a4a9de5 100644
--- a/cotisations/templates/cotisations/aff_banque.html
+++ b/cotisations/templates/cotisations/aff_banque.html
@@ -9,7 +9,7 @@
         <tr>
             <td>{{ banque.name }}</td>
             <td>{% if is_trez %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:edit-banque' banque.id %}"><i class="glyphicon glyphicon-pushpin"></i> Editer</a>{% endif %}
-            <a class="btn btn-info btn-sm" role="button" href="{% url 'cotisations:history' 'banque' banque.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <a class="btn btn-info btn-sm" role="button" href="{% url 'cotisations:history' 'banque' banque.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html
index 944c90fc..744fb5bc 100644
--- a/cotisations/templates/cotisations/aff_cotisations.html
+++ b/cotisations/templates/cotisations/aff_cotisations.html
@@ -38,7 +38,7 @@
             </ul></div></td>
             {% endif %}
             <td>{% if facture.valid %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:facture-pdf' facture.id %}"><i class="glyphicon glyphicon-save"></i> PDF</a>{% else %}Facture invalide{% endif %}</td>
-            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'cotisations:history' 'facture' facture.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'cotisations:history' 'facture' facture.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/cotisations/templates/cotisations/aff_paiement.html b/cotisations/templates/cotisations/aff_paiement.html
index c6d838b7..3c678ae3 100644
--- a/cotisations/templates/cotisations/aff_paiement.html
+++ b/cotisations/templates/cotisations/aff_paiement.html
@@ -9,7 +9,7 @@
         <tr>
             <td>{{ paiement.moyen }}</td>
             <td>{% if is_trez %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:edit-paiement' paiement.id %}"><i class="glyphicon glyphicon-pushpin"></i> Editer</a>{% endif %}
-            <a class="btn btn-info btn-sm" role="button" href="{% url 'cotisations:history' 'paiement' paiement.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <a class="btn btn-info btn-sm" role="button" href="{% url 'cotisations:history' 'paiement' paiement.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/machines/templates/machines/aff_extension.html b/machines/templates/machines/aff_extension.html
index f1ab63d5..c0ca761f 100644
--- a/machines/templates/machines/aff_extension.html
+++ b/machines/templates/machines/aff_extension.html
@@ -10,7 +10,7 @@
         <tr>
             <td>{{ extension.name }}</td>
             <td>{% if is_infra %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:edit-extension' extension.id %}"><i class="glyphicon glyphicon-pushpin"></i> Editer</a>{% endif %}</td>
-            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'machines:history' 'extension' extension.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'machines:history' 'extension' extension.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/machines/templates/machines/aff_iptype.html b/machines/templates/machines/aff_iptype.html
index 7067b0cc..5343b890 100644
--- a/machines/templates/machines/aff_iptype.html
+++ b/machines/templates/machines/aff_iptype.html
@@ -18,7 +18,7 @@
             <td>{{ type.domaine_ip }}</td>
             <td>{{ type.domaine_range }}</td>
 	    <td>{% if is_infra %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:edit-iptype' type.id %}"><i class="glyphicon glyphicon-pushpin"></i> Editer</a>{% endif %}</td>
-            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'machines:history' 'iptype' type.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'machines:history' 'iptype' type.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html
index 225c76ed..035710d8 100644
--- a/machines/templates/machines/aff_machines.html
+++ b/machines/templates/machines/aff_machines.html
@@ -1,50 +1,71 @@
 {% if machines_list.paginator %}
-{% include "pagination.html" with list=machines_list %} 
-{% endif %}    
+{% include "pagination.html" with list=machines_list %}
+{% endif %}
 
-    <table class="table table-striped">
-        <thead>
-            <tr>
-                <th>Proprietaire</th>
-                <th>Interfaces</th>
-            </tr>
-        </thead>
-       {% for machine in machines_list %}
+<table class="table">
+    <thead>
         <tr>
-            <td><p>{{ machine.user }}</p>
-            <p><a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-interface'  machine.id %}"><i class="glyphicon glyphicon-plus"></i> Ajouter une interface</p></a>
-            <p><a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-machine' machine.id %}"><i class="glyphicon glyphicon-trash"></i> Supprimer la machine</a></p>
-            <p><a class="btn btn-info btn-sm" role="button" href="{% url 'machines:history' 'machine' machine.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></p></td>
-            <td><table class="table table-striped">
-            <thead>
-            <tr>
-                <th>Nom dns</th>
-                <th>Type</th>
-                <th>Mac</th>
-                <th>Ipv4</th>
-                <th></th>
-            </tr>
-            </thead>
-            {% for interface in machine.interface_set.all %}
-            <tr>
+            <th>Actions</th>
+            <th>Proprietaire</th>
+            <th>Nom dns</th>
+            <th>Type</th>
+            <th>Mac</th>
+            <th>Ipv4</th>
+            <th></th>
+        </tr>
+    </thead>
+    {% for machine in machines_list %}
+        {% for interface in machine.interface_set.all %}
+        <tr class="active">
+            {% if forloop.first %}
+            <td rowspan="{{ machine.interface_set.all|length }}">
+                <a class="btn btn-primary" role="button" href="{% url 'machines:new-interface'  machine.id %}" title="Ajouter une interface">
+                    <i class="glyphicon glyphicon-plus"></i>
+                </a>
+                <a class="btn btn-danger" role="button" href="{% url 'machines:del-machine' machine.id %}" title="Supprimer la machine">
+                    <i class="glyphicon glyphicon-trash"></i>
+                </a>
+                <a class="btn btn-info" role="button" href="{% url 'machines:history' 'machine' machine.id %}" title="Historique">
+                    <i class="glyphicon glyphicon-time"></i>
+                </a>
+            </td>
+            <td rowspan="{{ machine.interface_set.all|length }}">
+                <p><b>{{ machine.user }}</b</p>
+            </td>
+            {% endif %}
             <td>{{ interface.dns }}</td>
             <td>{{ interface.type }}</td>
             <td>{{ interface.mac_address }}</td>
             <td>{{ interface.ipv4 }}</td>
-            <td><div class="dropdown">
-            <button class="btn btn-default dropdown-toggle" type="button" id="editioninterface" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-            Modifier
-            <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu" aria-labelledby="editioninterface">
-            <li><a href="{% url 'machines:edit-interface' interface.id %}"><i class="glyphicon glyphicon-hdd"></i> Editer</a></li>
-            <li><a href="{% url 'machines:history' 'interface' interface.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></li>
-            <li><a href="{% url 'machines:del-interface' interface.id %}"><i class="glyphicon glyphicon-trash"></i> Supprimer</a></li>
-            </ul></div></td>
-            </tr>
-            {% endfor %}
-            </table>
+            <td>
+                <div class="dropdown">
+                    <button class="btn btn-default dropdown-toggle" type="button" id="editioninterface" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                        Modifier <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu" aria-labelledby="editioninterface">
+                        <li>
+                            <a href="{% url 'machines:edit-interface' interface.id %}">
+                                <i class="glyphicon glyphicon-edit"></i> Editer
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'machines:history' 'interface' interface.id %}">
+                                <i class="glyphicon glyphicon-time"></i> Historique
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'machines:del-interface' interface.id %}">
+                                <i class="glyphicon glyphicon-trash"></i> Supprimer
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </td>
         </tr>
         {% endfor %}
-    </table>
+        <tr>
+            <td colspan="8"></td>
+        </tr>
+    {% endfor %}
+</table>
 
diff --git a/machines/templates/machines/aff_machinetype.html b/machines/templates/machines/aff_machinetype.html
index 5bdbd127..7c5055b3 100644
--- a/machines/templates/machines/aff_machinetype.html
+++ b/machines/templates/machines/aff_machinetype.html
@@ -12,7 +12,7 @@
             <td>{{ type.type }}</td>
             <td>{{ type.ip_type }}</td>
             <td>{% if is_infra %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:edit-machinetype' type.id %}"><i class="glyphicon glyphicon-pushpin"></i> Editer</a>{% endif %}</td>
-            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'machines:history' 'machinetype' type.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'machines:history' 'machinetype' type.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/users/templates/users/aff_bans.html b/users/templates/users/aff_bans.html
index 3ebbf2db..9db5ef0e 100644
--- a/users/templates/users/aff_bans.html
+++ b/users/templates/users/aff_bans.html
@@ -20,7 +20,7 @@
             <td>{{ ban.date_start }}</td>
             <td>{{ ban.date_end }}</td>
             <td>{% if is_bofh %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-ban' ban.id %}"><i class="glyphicon glyphicon-pushpin"></i> Editer</a>{% endif %}</td>
-            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'ban' ban.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'ban' ban.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/users/templates/users/aff_listright.html b/users/templates/users/aff_listright.html
index b673a34e..109dc1ff 100644
--- a/users/templates/users/aff_listright.html
+++ b/users/templates/users/aff_listright.html
@@ -12,7 +12,7 @@
             <td>{{ listright.listright }}</td>
             <td>{{ listright.gid }}</td>
             <td><a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-listright' listright.id %}"><i class="glyphicon glyphicon-pushpin"></i> Editer</a></td>
-            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'listright' listright.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'listright' listright.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/users/templates/users/aff_schools.html b/users/templates/users/aff_schools.html
index 4853f5d5..ed2e524b 100644
--- a/users/templates/users/aff_schools.html
+++ b/users/templates/users/aff_schools.html
@@ -10,7 +10,7 @@
         <tr>
             <td>{{ school.name }}</td>
             <td><a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-school' school.id %}"><i class="glyphicon glyphicon-pushpin"></i> Editer</a></td>
-            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'school' school.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'school' school.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/users/templates/users/aff_whitelists.html b/users/templates/users/aff_whitelists.html
index 0aec79fa..426a99c2 100644
--- a/users/templates/users/aff_whitelists.html
+++ b/users/templates/users/aff_whitelists.html
@@ -16,7 +16,7 @@
             <td>{{ whitelist.date_start }}</td>
             <td>{{ whitelist.date_end }}</td>
             <td>{% if is_cableur %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:edit-whitelist' whitelist.id %}"><i class="glyphicon glyphicon-flag"></i> Editer</a>{% endif %}</td>
-            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'whitelist' whitelist.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a></td>
+            <td><a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'whitelist' whitelist.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></td>
         </tr>
         {% endfor %}
     </table>
diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html
index 6f4067e7..e2b1456f 100644
--- a/users/templates/users/profil.html
+++ b/users/templates/users/profil.html
@@ -9,7 +9,7 @@
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:password' user.id %}"><i class="glyphicon glyphicon-lock"></i> Changer le mot de passe</a>  
     {% if is_bureau %}<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:state' user.id %}"><i class="glyphicon glyphicon-flash"></i> Changer le statut</a>
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-right' user.id %}"><i class="glyphicon glyphicon-ok"></i> Ajouter un droit</a>{% endif %}
-    <a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'user' user.id %}"><i class="glyphicon glyphicon-repeat"></i> Historique</a>
+    <a class="btn btn-info btn-sm" role="button" href="{% url 'users:history' 'user' user.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a>
     <br />
     <br />
     <table class="table table-striped">