diff --git a/horizon/templates/horizon/common/_limit_summary.html b/horizon/templates/horizon/common/_limit_summary.html
index af0a47208..b58ba8b4c 100644
--- a/horizon/templates/horizon/common/_limit_summary.html
+++ b/horizon/templates/horizon/common/_limit_summary.html
@@ -12,9 +12,19 @@
{{ quota.name }}
{% if quota.max|quotainf != '-1' %}
- {% blocktrans trimmed with used=quota.used|intcomma available=quota.max|quotainf|intcomma %}
- Used {{ used }} of {{ available }}
- {% endblocktrans %}
+ {% if quota.type == "totalRAMUsed" %}
+ {% blocktrans trimmed with used=quota.used|mb_float_format available=quota.max|quotainf|mb_float_format %}
+ Used {{ used }} of {{ available }}
+ {% endblocktrans %}
+ {% elif quota.type == "totalGigabytesUsed" %}
+ {% blocktrans trimmed with used=quota.used|diskgbformat available=quota.max|quotainf|diskgbformat %}
+ Used {{ used }} of {{ available }}
+ {% endblocktrans %}
+ {% else %}
+ {% blocktrans trimmed with used=quota.used|intcomma available=quota.max|quotainf|intcomma %}
+ Used {{ used }} of {{ available }}
+ {% endblocktrans %}
+ {% endif %}
{% else %}
{% blocktrans trimmed with used=quota.used|intcomma %}
Used {{ used }} (No Limit)
diff --git a/openstack_dashboard/usage/views.py b/openstack_dashboard/usage/views.py
index df22ade67..745aebf91 100644
--- a/openstack_dashboard/usage/views.py
+++ b/openstack_dashboard/usage/views.py
@@ -84,6 +84,7 @@ class UsageView(tables.DataTableView):
if len(t) > 3:
text = t[3]
context['charts'].append({
+ 'type': t[0],
'name': t[2],
'used': self.usage.limits[t[0]],
'max': self.usage.limits[t[1]],