diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js
index 92a9d8d8..3b86285f 100644
--- a/src/js/yunohost/controllers/tools.js
+++ b/src/js/yunohost/controllers/tools.js
@@ -154,61 +154,6 @@
         });
     });
 
-
-    // Download SSL Certificate Authority
-    app.get('#/tools/ca', function (c) {
-        c.view('tools/tools_ca');
-    });
-
-    // Security feed
-    app.get('#/tools/security-feed', function (c) {
-        var data = {
-            items: []
-        };
-
-        // Get security feed and display items
-        var forumUrl = 'https://forum.yunohost.org';
-        var securityUrl = 'https://forum.yunohost.org/c/security';
-        var securityFeed = 'https://yunohost.org/security.rss';
-
-        data.url = {
-            web: securityUrl,
-            rss: securityFeed
-        };
-
-        $.ajax({
-            url: securityFeed,
-            // dataType: (jQuery.browser.msie) ? "text" : "xml",
-            dataType: "xml"
-        })
-        .done(function(xml){
-            // Loop through items
-            $('item', xml).each(function(k, v) {
-                var link = $('link', v)[0].innerHTML;
-                if (typeof link == 'string' && link !== '' && link.charAt(0) == '/') {
-                    link = forumUrl+link;
-                }
-                var description = $('description', v)[0].textContent;
-                description = description.replace('href="/','href="'+forumUrl+'/');
-
-                var item = {
-                    guid: $('guid', v)[0].innerHTML,
-                    title: $('title', v)[0].innerHTML,
-                    url: link,
-                    desc: description,
-                    date: $('pubDate', v)[0].innerHTML.split(' +')[0],
-                };
-                data.items.push(item);
-            });
-
-            c.view('tools/tools_security_feed', data);
-        })
-        .fail(function() {
-            c.flash('fail', y18n.t('error_retrieve_feed', [securityFeed]));
-        });
-
-    });
-
     // Reboot or shutdown button
     app.get('#/tools/reboot', function (c) {
         c.view('tools/tools_reboot', {}, function() {
diff --git a/src/views/tools/tools_ca.ms b/src/views/tools/tools_ca.ms
deleted file mode 100644
index 1498bb7d..00000000
--- a/src/views/tools/tools_ca.ms
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="btn-breadcrumb">
-    <a href="#/" ><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
-    <a href="#/tools">{{t 'tools'}}</a>
-    <a href="#/tools/ca">{{t 'tools_download_ca'}}</a>
-</div>
-
-<div class="separator"></div>
-
-<div class="panel panel-default">
-    <div class="panel-body">
-    	<p>{{t 'tools_download_ca_desc'}}</p>
-    	<a role="button" href="ca.crt" class="btn btn-success">CA.crt</a>
-    </div>
-</div>
diff --git a/src/views/tools/tools_list.ms b/src/views/tools/tools_list.ms
index 17943de7..04bbb643 100644
--- a/src/views/tools/tools_list.ms
+++ b/src/views/tools/tools_list.ms
@@ -14,33 +14,17 @@
         <span class="pull-right fa-chevron-right"></span>
         <h2 class="list-group-item-heading">{{t 'migrations'}}</h2>
     </a>
-    <a href="#/tools/reboot" class="list-group-item slide clearfix">
+    <a href="#/tools/firewall" class="list-group-item slide clearfix">
         <span class="pull-right fa-chevron-right"></span>
-        <h2 class="list-group-item-heading">{{t 'tools_shutdown_reboot'}}</h2>
+        <h2 class="list-group-item-heading">{{t 'firewall'}}</h2>
     </a>
     <a href="#/tools/adminpw" class="list-group-item slide">
         <span class="fa-chevron-right pull-right"></span>
         <h2 class="list-group-item-heading">{{t 'tools_adminpw'}}</h2>
     </a>
-</div>
-
-<div class="separator"></div>
-<div class="separator"></div>
-
-<h2 style="font-weight:600; padding-left:0.5em;">{{t 'advanced'}}</h2>
-
-<div class="list-group">
-    <a href="#/tools/firewall" class="list-group-item slide clearfix">
+    <a href="#/tools/reboot" class="list-group-item slide clearfix">
         <span class="pull-right fa-chevron-right"></span>
-        <h2 class="list-group-item-heading">{{t 'firewall'}}</h2>
-    </a>
-    <a href="#/tools/security-feed" class="list-group-item slide">
-        <span class="fa-chevron-right pull-right"></span>
-        <h2 class="list-group-item-heading">{{t 'tools_security_feed'}}</h2>
-    </a>
-    <a href="#/tools/ca" class="list-group-item slide">
-        <span class="fa-chevron-right pull-right"></span>
-        <h2 class="list-group-item-heading">{{t 'tools_download_ca'}}</h2>
+        <h2 class="list-group-item-heading">{{t 'tools_shutdown_reboot'}}</h2>
     </a>
 </div>
 
diff --git a/src/views/tools/tools_security_feed.ms b/src/views/tools/tools_security_feed.ms
deleted file mode 100644
index faed2f87..00000000
--- a/src/views/tools/tools_security_feed.ms
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="btn-breadcrumb">
-    <a href="#/" ><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
-    <a href="#/tools">{{t 'tools'}}</a>
-    <a href="#/tools/ca">{{t 'tools_security_feed'}}</a>
-</div>
-
-<div class="separator"></div>
-
-{{#if items}}
-    <div class="list-group">
-    {{#items}}
-        <div class="list-group-item">
-            <!-- <a href="{{url}}" class="fa-chevron-right pull-right"></a> -->
-            <h2 class="list-group-item-heading"><a href="{{url}}">{{title}}</a></h2>
-            <div class="list-group-item-text">
-                <p class="pub-date"><em>{{date}}</em></p>
-                {{{desc}}}
-                <p class="text-right">
-                    <a href="{{url}}" role="button"  class="btn btn-default">{{t 'read_more'}}</a>
-                </p>
-            </div>
-        </div>
-    {{/items}}
-    </div>
-{{else}}
-<div class="alert alert-success">
-    <span class="fa-thumbs-o-up"></span> {{t 'tools_security_feed_no_items'}}
-</div>
-{{/if}}
-
-<div>
-    <a role="button" href="{{url.web}}" class="btn btn-success" target="_blank"><span class="fa-list"></span> {{t 'tools_security_feed_view_items'}}</a> 
-    <a role="button" href="{{url.rss}}" class="btn btn-warning" target="_blank"><span class="fa-rss"></span> {{t 'tools_security_feed_subscribe_rss'}}</a>
-</div>