diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js
index 66ccef2b..e2c127ec 100644
--- a/src/js/yunohost/controllers/apps.js
+++ b/src/js/yunohost/controllers/apps.js
@@ -68,7 +68,7 @@
             c.api('/apps?raw', function (dataraw) { // http://api.yunohost.org/#!/app/app_list_get_8
                 var apps = []
                 $.each(data['apps'], function(k, v) {
-                    if(dataraw[v['id']]['high_quality'] && parseInt(dataraw[v['id']]['level']) > 7)
+                    if (dataraw[v['id']]['high_quality'] && parseInt(dataraw[v['id']]['level']) > 7)
                     {
                         dataraw[v['id']]['state'] = "high-quality";
                     }
@@ -87,8 +87,10 @@
                                                               && dataraw[v['id']]['manifest']['license'] !== 'free');
                         dataraw[v['id']]['updateDate'] = dataraw[v['id']]['lastUpdate'] * 1000 || 0;
                         dataraw[v['id']]['isSafe'] = (dataraw[v['id']]['installColor'] !== 'danger');
+                        dataraw[v['id']]['decentQuality'] = (dataraw[v['id']]['levelColor'] === "hmokay"
+                                                          || dataraw[v['id']]['levelColor'] === "success")?"decentQuality":"badQuality";
                         dataraw[v['id']]['isWorking'] = isWorking ? "isworking" : "notFullyWorking";
-                        dataraw[v['id']]['isHighQuality'] = (state === "high-quality") ? "ishighquality" : "";
+                        dataraw[v['id']]['isHighQuality'] = (state === "high-quality") ? "isHighQuality" : "";
 
                         jQuery.extend(dataraw[v['id']], v);
                         apps.push(dataraw[v['id']]);
@@ -116,8 +118,8 @@
                       return inputMatch && classMatch;
                     },
 
-                    // Keep only official apps at first render
-                    cardGrid.isotope({ filter: '.isworking' });
+                    // Default filter is 'decent quality apps'
+                    cardGrid.isotope({ filter: '.decentQuality' });
 
                     jQuery('.dropdownFilter').on('click', function() {
                         // change dropdown label
diff --git a/src/locales/en.json b/src/locales/en.json
index 8dd39715..8b352690 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -227,6 +227,7 @@
     "ok": "OK",
     "only_highquality_apps": "Only high-quality apps",
     "only_working_apps": "Only working apps",
+    "only_decent_quality_apps": "Only decent quality apps",
     "open": "Open",
     "operations": "Operations",
     "os": "OS",
diff --git a/src/views/app/app_list_install.ms b/src/views/app/app_list_install.ms
index ab803dc4..6e301f90 100644
--- a/src/views/app/app_list_install.ms
+++ b/src/views/app/app_list_install.ms
@@ -20,11 +20,12 @@
     <input type="text" id="filter-app-cards" class="form-control" role="textbox"  placeholder="{{t 'search_for_apps'}}" aria-describedby="basic-addon0"/>
     <div class="input-group-btn">
         <button type="button" role="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <span id="app-cards-list-filter-text">{{t 'only_working_apps'}}</span> <span class="caret"></span>
+            <span id="app-cards-list-filter-text">{{t 'only_decent_quality_apps'}}</span> <span class="caret"></span>
         </button>
-        <ul id="dropdownFilter" class="dropdown-menu" data-filter="isworking" role="menu">
+        <ul id="dropdownFilter" class="dropdown-menu" data-filter="decentQuality" role="menu">
+            <li role="presentation" class="button dropdownFilter" data-filter="isHighQuality"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'only_highquality_apps'}}</a></li>
+            <li role="presentation" class="button dropdownFilter" data-filter="decentQuality"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'only_decent_quality_apps'}}</a></li>
             <li role="presentation" class="button dropdownFilter" data-filter="isworking"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'only_working_apps'}}</a></li>
-            <li role="presentation" class="button dropdownFilter" data-filter="ishighquality"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'only_highquality_apps'}}</a></li>
             <li role="presentation" class="button dropdownFilter" data-filter="*"><a class="menu-item" role="menu-item" tabindex="-1">{{t 'all_apps'}}</a></li>
         </ul>
     </div>
@@ -34,7 +35,7 @@
 
 <div class="list-group grid">
 {{#apps}}
-  <div class="app-card panel panel-default {{status}} {{state}} {{isWorking}} {{isHighQuality}} {{level}}-level">
+  <div class="app-card panel panel-default {{status}} {{state}} {{isWorking}} {{isHighQuality}} {{decentQuality}} {{level}}-level">
         <div class="panel-body">
             <h2 class="app-title">{{name}}</h2>
             <div class="category">