diff --git a/website/web/static/minimize1.jpg b/website/web/static/down.jpg
similarity index 100%
rename from website/web/static/minimize1.jpg
rename to website/web/static/down.jpg
diff --git a/website/web/static/minimize2.jpg b/website/web/static/down_left.jpg
similarity index 100%
rename from website/web/static/minimize2.jpg
rename to website/web/static/down_left.jpg
diff --git a/website/web/static/tree.js b/website/web/static/tree.js
index 273f370b..8777cbcb 100644
--- a/website/web/static/tree.js
+++ b/website/web/static/tree.js
@@ -95,19 +95,23 @@ function LocateNode(urlnode_uuid) {
         .style('font-size', '16px');
 };
 
+function UnflagAllNodes() {
+    d3.selectAll('.node_data').select('rect').style('fill', 'white');
+    d3.selectAll('.node_data').select('text').style('fill', 'black');
+    d3.selectAll('.node_data').select("#flag")
+        .text("🏁")
+        .on('click', function(d) {
+            PermanentNodeHighlight(d.data.uuid);
+        });
+};
+
 function UnflagHostNode(hostnode_uuid) {
-    var to_fill = d3.select("#node_" + hostnode_uuid).select('rect');
-    to_fill
-        .style('fill', 'white');
-
-    var to_fill = d3.select("#node_" + hostnode_uuid).select('text');
-    to_fill
-        .style('fill', 'black');
-
+    d3.select("#node_" + hostnode_uuid).select('rect').style('fill', 'white');
+    d3.select("#node_" + hostnode_uuid).select('text').style('fill', 'black');
     d3.select("#node_" + hostnode_uuid).select("#flag")
         .text("🏁")
         .on('click', function(d) {
-            PermanentNodeHighlight(hostnode_uuid);
+            PermanentNodeHighlight(d.data.uuid);
         });
 };
 
@@ -115,18 +119,12 @@ function PermanentNodeHighlight(hostnode_uuid) {
     var element = document.getElementById("node_" + hostnode_uuid);
     element.scrollIntoView({behavior: "smooth", block: "center", inline: "nearest"});
 
-    var to_fill = d3.select("#node_" + hostnode_uuid).select('rect');
-    to_fill
-        .style('fill', 'black');
-
-    var to_fill = d3.select("#node_" + hostnode_uuid).select('text');
-    to_fill
-        .style('fill', 'white');
-
+    d3.select("#node_" + hostnode_uuid).select('rect').style('fill', 'black');
+    d3.select("#node_" + hostnode_uuid).select('text').style('fill', 'white');
     d3.select("#node_" + hostnode_uuid).select("#flag")
         .text('❌')
         .on('click', function(d) {
-            UnflagHostNode(hostnode_uuid);
+            UnflagHostNode(d.data.uuid);
         });
 };
 
diff --git a/website/web/static/maximize1.jpg b/website/web/static/up.jpg
similarity index 100%
rename from website/web/static/maximize1.jpg
rename to website/web/static/up.jpg
diff --git a/website/web/static/maximize2.jpg b/website/web/static/up_right.jpg
similarity index 100%
rename from website/web/static/maximize2.jpg
rename to website/web/static/up_right.jpg
diff --git a/website/web/templates/tree.html b/website/web/templates/tree.html
index cbb138e5..cc199f7a 100644
--- a/website/web/templates/tree.html
+++ b/website/web/templates/tree.html
@@ -66,7 +66,7 @@
       </div>
       <div style="display: inline;">
         <button type="button" class="btn btn-link" data-toggle="collapse" data-target="#menu">
-            <img src="{{ url_for('static', filename='minimize2.jpg') }}" alt="Minimize menu" height="25" width="25">
+            <img src="{{ url_for('static', filename='up.jpg') }}" alt="Minimize menu" height="25" width="25">
         </button>
       </div>
     </center>
@@ -79,6 +79,9 @@
         <a href="#statsModal" data-remote="{{ url_for('stats', tree_uuid=tree_uuid) }}"
          data-toggle="modal" data-target="#statsModal" role="button">Show Statistics</a>
       </li>
+      <li>
+        <a href="#unflag" role="button" onclick="UnflagAllNodes();">Unflag all nodes</a>
+      </li>
       {% if enable_mail_notification %}
       <li>
         <a href="#emailModal" data-toggle="modal" data-target="#emailModal" role="button">Notify by mail</a>
@@ -89,7 +92,7 @@
   <div style="width: 100px">
     <div style="display: inline;">
     <button type="button" class="btn btn-link" data-toggle="collapse" data-target="#menu">
-      <img src="{{ url_for('static', filename='maximize2.jpg') }}" alt="Maximize" height="40" width="40">
+      <img src="{{ url_for('static', filename='down.jpg') }}" alt="Maximize" height="40" width="40">
     </button>
     </div>
     <div style="display: inline">
@@ -106,7 +109,7 @@
       </div>
       <div style="display: inline;">
         <button type="button" class="btn btn-link" data-toggle="collapse" data-target="#legend">
-            <img src="{{ url_for('static', filename='minimize2.jpg') }}" alt="Minimize legend" height="25" width="25">
+            <img src="{{ url_for('static', filename='down.jpg') }}" alt="Minimize legend" height="25" width="25">
         </button>
       </div>
     </center>
@@ -153,7 +156,7 @@
   <div style="width: 100px">
     <div style="display: inline;">
     <button type="button" class="btn btn-link" data-toggle="collapse" data-target="#legend">
-      <img src="{{ url_for('static', filename='maximize2.jpg') }}" alt="Maximize legend" height="40" width="40">
+      <img src="{{ url_for('static', filename='up.jpg') }}" alt="Maximize legend" height="40" width="40">
     </button>
     </div>
     <div style="display: inline">
@@ -171,7 +174,7 @@
     </div>
     <div style="display: inline;">
       <button type="button" class="btn btn-link" data-toggle="collapse" data-target="#tree-details">
-          <img src="{{ url_for('static', filename='minimize1.jpg') }}"
+          <img src="{{ url_for('static', filename='down.jpg') }}"
                alt="Minimize tree details" height="25" width="25">
       </button>
     </div>
@@ -194,7 +197,7 @@
   <div style="width: 100px;float: right;">
   <div style="display: inline;">
   <button type="button" class="btn btn-link" data-toggle="collapse" data-target="#tree-details">
-    <img src="{{ url_for('static', filename='maximize1.jpg') }}" alt="Minimize tree details" height="40" width="40">
+    <img src="{{ url_for('static', filename='up.jpg') }}" alt="Minimize tree details" height="40" width="40">
   </button>
   </div>
   <div style="display: inline">