diff --git a/src/css/style.less b/src/css/style.less
index f7b0e207..4719e7bd 100644
--- a/src/css/style.less
+++ b/src/css/style.less
@@ -657,6 +657,9 @@ input[type='radio'].nice-radio {
 	}
 }
 
+.app-state {
+    font-size: 10px;
+}
 
 .app-title, .app-category-title {
     margin-top: 5px;
@@ -674,6 +677,7 @@ input[type='radio'].nice-radio {
     margin-bottom: 3px;
     margin-right: 7px;
     margin-top: -5px;
+    height: 18px;
 }
 
 .auto-width {
@@ -690,6 +694,7 @@ input[type='radio'].nice-radio {
 
 .app-card .panel-body {
     padding: 1.5rem;
+    padding-bottom: 0.5rem;
 
     h3 {
       margin-top: 0;
diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js
index c62477d5..246aa04d 100644
--- a/src/js/yunohost/controllers/apps.js
+++ b/src/js/yunohost/controllers/apps.js
@@ -70,7 +70,7 @@
         }
         else
         {
-            return 'success';
+            return 'info';
         }
     }
 
diff --git a/src/locales/en.json b/src/locales/en.json
index 35145778..76319c71 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -23,10 +23,12 @@
     "app_no_actions": "This application doesn't have any actions",
     "app_repository": "Application origin: ",
     "app_state": "Application state: ",
-    "app_state_inprogress": "in progress",
+    "app_state_inprogress": "not yet working",
     "app_state_inprogress_explanation": "This maintainer of this app declared that this application is not ready yet for production use. BE CAREFUL!",
     "app_state_notworking": "not working",
     "app_state_notworking_explanation": "This maintainer of this app declared it as 'not working'. IT WILL BREAK YOUR SYSTEM!",
+    "app_state_low_quality": "low quality",
+    "app_state_low_quality_explanation": "This app may be functional, but may still contain issues, or is not fully integrated with YunoHost, or it does not respect the good practices.",
     "app_state_high-quality": "high quality",
     "app_state_high-quality_explanation": "This app is well-integrated with YunoHost. It has been (and is!) peer-reviewed by the YunoHost app team. It can be expected to be safe and maintained on the long-term.",
     "app_state_working": "working",
@@ -218,8 +220,8 @@
     "only_decent_quality_apps": "Only decent quality apps",
     "open": "Open",
     "operations": "Operations",
-    "orphaned": "not maintained",
-    "orphaned_details": "This app is not maintained anymore. It may still be working but won't receive any upgrade. Feel free to come and revive it!",
+    "orphaned": "Not maintained",
+    "orphaned_details": "This app has not been maintained for quite some time. It may still be working, but won't receive any upgrade until somebody volunteers to take care of it. Feel free to contribute to revive it!",
     "password": "Password",
     "password_confirmation": "Password confirmation",
     "password_description": "Password must be at least %s characters long.",
diff --git a/src/views/app/app_catalog.ms b/src/views/app/app_catalog.ms
index aac34205..209dc177 100644
--- a/src/views/app/app_catalog.ms
+++ b/src/views/app/app_catalog.ms
@@ -57,23 +57,28 @@
 
 <div id="apps" class="list-group grid">
 {{#apps}}
-  <div class="app-card panel panel-default {{status}} {{state}} {{isWorking}} {{isHighQuality}} {{decentQuality}} {{level}}-level" data-category="{{category}}" data-subtags="{{#subtags}}{{.}}{{#unless @last}},{{/unless}}{{/subtags}}">
+  <div class="app-card panel panel-default {{state}} {{isWorking}} {{isHighQuality}} {{decentQuality}} {{level}}-level" data-category="{{category}}" data-subtags="{{#subtags}}{{.}}{{#unless @last}},{{/unless}}{{/subtags}}">
         <div class="panel-body">
-            <h2 class="app-title">{{manifest.name}}</h2>
-            <div class="category">
-              <span class="label label-{{stateColor}} label-as-badge app-state" title="{{t (concat 'app_state_' state '_explanation') }}">{{t (concat 'app_state_' state) }}</span>
-              <a target="_BLANK" href="https://yunohost.org/#/packaging_apps_levels"><span class="label label-{{levelColor}} label-as-badge app-level" title="{{t 'app_level'}}">{{t 'level'}} {{levelFormatted}}</span></a>
-              <span class="label label-{{maintainedColor}} label-as-badge maintained-status" title="{{t (concat maintained '_details') }}"> {{t maintained}}</span>
-            </div>
+            <h2 class="app-title">
+            {{manifest.name}}
+            {{#if (eq state 'working') }}
+            {{#if (eq decentQuality 'badQuality')}}
+            <span class="label label-warning label-as-badge app-state" title="{{t 'app_state_low_quality_explanation' }}">{{t 'app_state_low_quality' }}</span>
+            {{/if}}
+            {{else}}
+            <span class="label label-{{stateColor}} label-as-badge app-state" title="{{t (concat 'app_state_' state '_explanation') }}">{{t (concat 'app_state_' state) }}</span>
+            {{/if}}
+            </h2>
             <div class="app-card-desc">{{manifest.description}}</div>
         </div>
             <div class="app-card-date-maintainer">
-                <i class="fa-refresh"></i> {{formatDate updateDate day="numeric" month="long" year="numeric"}} -
-                <span title="{{t 'current_maintainer_title'}}" class="maintained"></span><i class="fa-user"></i> {{manifest.maintainer}}</span>
+              {{#if (eq maintainedColor 'danger') }}
+              <span class="text text-warning maintained-status" title="{{t (concat maintained '_details') }}"><i class="fa-warning"></i> {{t maintained}}</span>
+              {{/if}}
             </div>
             <div class="btn-group" role="group">
                 <a href="{{git.url}}" target="_BLANK" type="button" role="button" class="btn btn-default col-xs-4">
-                    <i class="fa-globe"></i> Code
+                    <i class="fa-code"></i> Code
                 </a>
                 <a href="{{git.url}}/blob/master/README.md" target="_BLANK" type="button" role="button" class="btn btn-default col-xs-4">
                     <i class="fa-book"></i> Readme