diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9fddbcd17a8..d59796688d0 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -37,6 +37,7 @@
 
     <dimen name="data_usage_chart_height">228dip</dimen>
     <dimen name="data_usage_chart_optimalWidth">440dip</dimen>
+    <dimen name="usage_number_text_size">36sp</dimen>
 
     <dimen name="volume_seekbar_side_margin">8dip</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9f2fe1bbcb4..4d6902b25d4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8758,6 +8758,9 @@
     <!-- Data usage remaining string [CHAR LIMIT=30] -->
     <string name="data_used"><xliff:g name="bytes" example="2 GB">^1</xliff:g> used</string>
 
+    <!-- Data usage remaining string [CHAR LIMIT=30] -->
+    <string name="data_used_formatted"><xliff:g name="value" example="500">^1</xliff:g> <xliff:g name="units" example="GB">^2</xliff:g> used</string>
+
     <!-- Data usage over limit string [CHAR LIMIT=30] -->
     <string name="data_overusage"><xliff:g name="bytes" example="2 GB">^1</xliff:g> over</string>
 
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index e8715aac296..0ce8e4f86e0 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -20,8 +20,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.format.Formatter;
+import android.text.style.AbsoluteSizeSpan;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
@@ -166,9 +169,20 @@ public class DataUsageSummaryPreference extends Preference {
 
     private void updateDataUsageLabels(PreferenceViewHolder holder) {
         TextView usageNumberField = (TextView) holder.findViewById(R.id.data_usage_view);
-        usageNumberField.setText(TextUtils.expandTemplate(
-                getContext().getString(R.string.data_used),
-                Formatter.formatFileSize(getContext(), mDataplanUse)));
+
+        final Formatter.BytesResult usedResult = Formatter.formatBytes(getContext().getResources(),
+                mDataplanUse, Formatter.FLAG_CALCULATE_ROUNDED);
+        final SpannableString usageNumberText = new SpannableString(usedResult.value);
+        final int textSize =
+                getContext().getResources().getDimensionPixelSize(R.dimen.usage_number_text_size);
+        usageNumberText.setSpan(new AbsoluteSizeSpan(textSize), 0, usageNumberText.length(),
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        CharSequence template = getContext().getText(R.string.data_used_formatted);
+
+        CharSequence usageText =
+                TextUtils.expandTemplate(template, usageNumberText, usedResult.units);
+        usageNumberField.setText(usageText);
+
         if (mHasMobileData && mNumPlans >= 0 && mDataplanSize > 0L) {
             TextView usageRemainingField = (TextView) holder.findViewById(R.id.data_remaining_view);
             long dataRemaining = mDataplanSize - mDataplanUse;