diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index dfaf6e5b9..19e8cfe68 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -1,5 +1,6 @@
 @colortheme_font: 'Open Sans', 'Helvetica Neue', sans-serif;
 @colortheme_app-font-size: 16px;
+@colortheme_app-font-size-small: 13px;
 @colortheme_app-font: @colortheme_app-font-size @colortheme_font;
 
 @colortheme_logo-1: #326599;
diff --git a/customize.dist/src/less2/include/limit-bar.less b/customize.dist/src/less2/include/limit-bar.less
index 52ae638cb..ff70a50a2 100644
--- a/customize.dist/src/less2/include/limit-bar.less
+++ b/customize.dist/src/less2/include/limit-bar.less
@@ -7,27 +7,25 @@
     .cp-limit-container {
         @colortheme_green: #5cb85c;
         display: inline-flex;
-        flex-flow: column-reverse;
+        flex-flow: column;
         width: 100%;
-        margin-top: 20px;
+        margin: 20px 0px;
         .cp-limit-bar {
             display: inline-flex;
             justify-content: center;
             align-items: center;
-
             max-width: 100%;
-            margin: 4px;
+            margin: 5px;
             box-sizing: border-box;
             border-radius: 3px;
             background: white;
             position: relative;
             text-align: center;
-            width: ~"calc(100% - 8px)";
-            height: 35px;
-            line-height: 25px;
+            width: ~"calc(100% - 10px)";
+            height: 10px;
             overflow: hidden;
             .cp-limit-usage {
-                height: 100%;
+                height: 10px;
                 display: inline-block;
                 background: blue;
                 position: absolute;
@@ -35,7 +33,7 @@
                 top: 0;
                 z-index: 1; // .usage
                 &.cp-limit-usage-normal {
-                    background: lighten(@colortheme_green, 15%);
+                    background: @colortheme_green;
                 }
                 &.cp-limit-usage-warning {
                     background: orange;
@@ -44,26 +42,26 @@
                     background: red;
                 }
             }
-            .cp-limit-usage-text {
-                position: relative;
-                color: @cryptpad_text_col;
-                z-index: 2; // .usageText
-                font-size: @colortheme_app-font-size;
-                
-            }
         }
+
+        .cp-limit-usage-text {
+            color: @cryptpad_text_col;
+            margin-left: 5px;
+            z-index: 2; // .usageText
+            font-size: @colortheme_app-font-size-small; 
+        }
+                
         .cp-limit-buttons {
             display: flex;
             flex-wrap: wrap;
             justify-content: space-around;
             justify-content: space-evenly;
-            //padding: 2px;
             a {
                 height: 25px;
                 display: inline-flex;
                 align-items: center;
                 min-width: 150px;
-                margin: 2px;
+                margin: 3px 5px;
                 width: 50%;
                 padding-top: 0;
                 padding-bottom: 0;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ffaefa45d..0e700721e 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2259,13 +2259,14 @@ define([
                 prettyUsage = Messages._getKey('formattedMB', [usage]);
                 prettyLimit = Messages._getKey('formattedMB', [limit]);
             }
-
+            
             if (quota < 0.8) { $usage.addClass('cp-limit-usage-normal'); }
             else if (quota < 1) { $usage.addClass('cp-limit-usage-warning'); }
             else { $usage.addClass('cp-limit-usage-above'); }
             var $text = $('<span>', {'class': 'cp-limit-usage-text'});
-            $text.text(usage + ' / ' + prettyLimit);
-            $limit.append($usage).append($text);
+            $text.html(Messages._getKey('storageStatus', [prettyUsage, prettyLimit]));
+            $container.prepend($text);
+            $limit.append($usage);
         };
 
         var updateUsage = Util.notAgainForAnother(function () {
diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index b1907076a..e99ae28a7 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -73,6 +73,7 @@
     "upgrade": "Upgrade",
     "upgradeTitle": "Upgrade your account to increase the storage limit",
     "upgradeAccount": "Upgrade account",
+    "storageStatus": "Storage:<br /><b>{0}</b> used out of <b>{1}</b>",
     "MB": "MB",
     "GB": "GB",
     "KB": "KB",