diff --git a/src/js/directives/amount.js b/src/js/directives/amount.js
deleted file mode 100644
index 9622ca09d..000000000
--- a/src/js/directives/amount.js
+++ /dev/null
@@ -1,92 +0,0 @@
-'use strict';
-
-/**
- * @desc amount directive that can be used to display formatted financial values
- * size-equal attribute is optional, defaults to false.
- * @example fee = {
- *  value: 12.49382901,
- *  currency: 'BCH'
- * }
- * @example <amount value="fee.value" currency="fee.currency"></amount>
- * @example <amount value="fee.value" currency="fee.currency" size-equal="true"></amount>
- */
-angular.module('bitcoincom.directives')
-  .directive('amount', [
-  '$timeout',
-  function($timeout) {
-    return {
-      restrict: 'E',
-      scope: {
-        value: '=',
-        currency: '=',
-        sizeEqual: '='
-      },
-      templateUrl: 'views/includes/amount.html',
-      controller: ['$scope', function($scope) {
-        $scope.displaySizeEqual = typeof $scope.sizeEqual == 'undefined' ? false : true;
-
-        var decimalPlaces = {
-          '0': ['BIF', 'CLP', 'DJF', 'GNF', 'ILS', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'],
-          '3': ['BHD', 'IQD', 'JOD', 'KWD', 'OMR', 'TND'],
-          '8': ['BCH', 'BTC']
-        };
-
-        var numberWithCommas = function(x) {
-          return parseFloat(x).toLocaleString();
-        };
-
-        var buildAmount = function(start, middle, end) {
-          $scope.start = start;
-          $scope.middle = middle;
-          $scope.end = end;
-        };
-
-        var getDecimalPlaces = function(currency) {
-          if (decimalPlaces['0'].indexOf($scope.currency.toUpperCase()) > -1) return '0';
-          if (decimalPlaces['3'].indexOf($scope.currency.toUpperCase()) > -1) return '3';
-          if (decimalPlaces['8'].indexOf($scope.currency.toUpperCase()) > -1) return '8';
-          return '2';
-        };
-
-        var formatNumbers = function(currency, value) {
-          switch (getDecimalPlaces(currency)) {
-            case '0':
-              var valueFormatted = numberWithCommas(Math.round(parseFloat(value)));
-              buildAmount(valueFormatted, '', '');
-              break;
-  
-            case '2':
-              var valueProcessing = parseFloat(parseFloat(value).toFixed(2));
-              var valueFormatted = numberWithCommas(valueProcessing);
-              buildAmount(valueFormatted, '', '');
-              break;
-  
-            case '3':
-              var valueProcessing = parseFloat(parseFloat(value).toFixed(3));
-              var valueFormatted = numberWithCommas(valueProcessing);
-              buildAmount(valueFormatted, '', '');
-              break;
-  
-            case '8':
-              var valueFormatted = parseFloat(value).toFixed(8);
-              if (parseFloat(value) == 0) {
-                buildAmount('0', '', '');
-              } else {
-                buildAmount(valueFormatted, '', '');
-                var start = numberWithCommas(valueFormatted.slice(0, -5));
-                var middle = valueFormatted.slice(-5, -2);
-                var end = valueFormatted.substr(valueFormatted.length - 2);
-                buildAmount(start, middle, end);
-              }
-              break;
-          }
-        }
-
-        formatNumbers($scope.currency, $scope.value);
-        $scope.$watchGroup(['currency', 'value'], function() {
-          formatNumbers($scope.currency, $scope.value);
-        });
-      }]
-    };
-  }
-]);
\ No newline at end of file
diff --git a/src/js/directives/formattedAmount.js b/src/js/directives/formattedAmount.js
new file mode 100644
index 000000000..ac74afd2b
--- /dev/null
+++ b/src/js/directives/formattedAmount.js
@@ -0,0 +1,96 @@
+'use strict';
+
+/**
+ * @desc amount directive that can be used to display formatted financial values
+ * size-equal attribute is optional, defaults to false.
+ * @example fee = {
+ *  value: 12.49382901,
+ *  currency: 'BCH'
+ * }
+ * @example <formatted-amount value="fee.value" currency="fee.currency"></formatted-amount>
+ * @example <formatted-amount value="fee.value" currency="fee.currency" size-equal="true"></formatted-amount>
+ */
+angular.module('bitcoincom.directives')
+  .directive('formattedAmount', function(configService, uxLanguage) {
+    return {
+      restrict: 'E',
+      scope: {
+        value: '=',
+        currency: '=',
+        sizeEqual: '='
+      },
+      templateUrl: 'views/includes/formatted-amount.html',
+      controller: function($scope, $timeout) {
+        $scope.displaySizeEqual = !!$scope.sizeEqual;
+
+        configService.whenAvailable(function(config) {
+          $timeout(function() {
+            var decimalPlaces = {
+              '0': ['BIF', 'CLP', 'DJF', 'GNF', 'ILS', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'],
+              '3': ['BHD', 'IQD', 'JOD', 'KWD', 'OMR', 'TND'],
+              '8': ['BCH', 'BTC']
+            };
+            var localizeNumbers = function(x, minimumFractionDigits = 0, useGrouping = true) {
+              return parseFloat(x).toLocaleString(uxLanguage.getCurrentLanguage(), {
+                minimumFractionDigits: minimumFractionDigits,
+                useGrouping: useGrouping
+              });
+            };
+    
+            var buildAmount = function(start, middle, end) {
+              $scope.start = start;
+              $scope.middle = middle;
+              $scope.end = end;
+            };
+    
+            var getDecimalPlaces = function(currency) {
+              if (decimalPlaces['0'].indexOf($scope.currency.toUpperCase()) > -1) return '0';
+              if (decimalPlaces['3'].indexOf($scope.currency.toUpperCase()) > -1) return '3';
+              if (decimalPlaces['8'].indexOf($scope.currency.toUpperCase()) > -1) return '8';
+              return '2';
+            };
+    
+            var formatNumbers = function(currency, value) {
+              switch (getDecimalPlaces(currency)) {
+                case '0':
+                  var valueFormatted = localizeNumbers(Math.round(parseFloat(value)));
+                  buildAmount(valueFormatted, '', '');
+                  break;
+      
+                case '3':
+                  var valueProcessing = parseFloat(parseFloat(value).toFixed(3));
+                  var valueFormatted = localizeNumbers(valueProcessing);
+                  buildAmount(valueFormatted, '', '');
+                  break;
+      
+                case '8':
+                  var valueFormatted = parseFloat(value).toFixed(8);
+                  if (parseFloat(value) == 0) {
+                    buildAmount('0', '', '');
+                  } else {
+                    var valueFormatted = localizeNumbers(valueFormatted, 8);
+                    var start = valueFormatted.slice(0, -5);
+                    var middle = valueFormatted.slice(-5, -2);
+                    var end = valueFormatted.substr(valueFormatted.length - 2);
+                    buildAmount(start, middle, end);
+                  }
+                  break;
+      
+                default:
+                  var valueProcessing = parseFloat(parseFloat(value).toFixed(2));
+                  var valueFormatted = localizeNumbers(valueProcessing);
+                  buildAmount(valueFormatted, '', '');
+                  break;
+              }
+            }
+    
+            formatNumbers($scope.currency, $scope.value);
+            $scope.$watchGroup(['currency', 'value'], function() {
+              formatNumbers($scope.currency, $scope.value);
+            });
+          });
+        });
+      }
+    };
+  }
+);
\ No newline at end of file
diff --git a/www/views/includes/amount.html b/www/views/includes/formatted-amount.html
similarity index 100%
rename from www/views/includes/amount.html
rename to www/views/includes/formatted-amount.html