diff --git a/src/components/filetree.html b/src/components/filetree.html
index ab1cb0d80..5f80f334b 100644
--- a/src/components/filetree.html
+++ b/src/components/filetree.html
@@ -69,7 +69,7 @@
         </td>
         <td class="elide-table-cell" ng-dblclick="open(entry)">{{ entry.fileName }}<span ng-show="entry.isSymbolicLink" class="text-muted" style="margin-left: 20px;">{{ 'filemanager.list.symlink' | tr:{ target: entry.target } }}</span></td>
         <td style="width:100px" class="elide-table-cell" ng-dblclick="open(entry)">{{ entry.uid | prettyOwner }}</td>
-        <td style="width: 80px" class="elide-table-cell" ng-dblclick="open(entry)">{{ entry.size | prettyByteSize }}</td>
+        <td style="width: 80px" class="elide-table-cell" ng-dblclick="open(entry)">{{ entry.size | prettyDecimalSize }}</td>
         <td style="width:100px" class="elide-table-cell" ng-dblclick="open(entry)" uib-tooltip="{{ entry.mtime | prettyLongDate }}" tooltip-append-to-body="true">{{ entry.mtime | prettyDate }}</td>
         <td style="width: 45px">
           <button type="button" class="btn btn-xs btn-default context-menu-action" context-menu="menuOptions" model="entry" context-menu-on="click" ng-click="onEntryContextMenu($event, entry)"><i class="fas fa-ellipsis-h"></i></button>
@@ -77,4 +77,4 @@
       </tr>
     </tbody>
   </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/filemanager.html b/src/filemanager.html
index 66efd1036..fd265ece6 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -252,7 +252,7 @@
             <p class="text-danger" ng-show="uploadStatus.error === 'exists'">{{ 'filemanager.uploadingDialog.errorAlreadyExists' | tr }}</p>
             <p class="text-danger" ng-show="uploadStatus.error === 'generic'">{{ 'filemanager.uploadingDialog.errorFailed' | tr }}</p>
           </div>
-          <span><b>{{ uploadStatus.sizeDone | prettyByteSize }}</b> (total {{ uploadStatus.size | prettyByteSize }})</span>
+          <span><b>{{ uploadStatus.sizeDone | prettyDecimalSize }}</b> (total {{ uploadStatus.size | prettyDecimalSize }})</span>
           <div class="progress progress-striped active" ng-hide="uploadStatus.error">
             <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ uploadStatus.percentDone || 0 }}%"></div>
           </div>
diff --git a/src/js/client.js b/src/js/client.js
index fc812b8be..a11085a2e 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -234,20 +234,34 @@ function imageErrorHandler(elem) {
 // Shared Angular Filters
 // ----------------------------------------------
 
-// binary units (non SI) 1024 based
-function prettyByteSize(size, fallback) {
+// https://en.wikipedia.org/wiki/Binary_prefix
+// binary units (IEC) 1024 based
+function prettyBinarySize(size, fallback) {
     if (!size) return fallback || 0;
 
+    // we can also use KB here (JEDEC)
     var i = Math.floor(Math.log(size) / Math.log(1024));
-    return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i];
+    return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'KiB', 'MiB', 'GiB', 'TiB'][i];
 }
 
-angular.module('Application').filter('prettyByteSize', function () {
-    return function (size, fallback) { return prettyByteSize(size, fallback) || '0 kb'; };
+// decimal units (SI) 1000 based
+function prettyDecimalSize(size, fallback) {
+    if (!size) return fallback || 0;
+
+    var i = Math.floor(Math.log(size) / Math.log(1000));
+    return (size / Math.pow(1000, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i];
+}
+
+angular.module('Application').filter('prettyDecimalSize', function () {
+    return function (size, fallback) { return prettyDecimalSize(size, fallback) || '0 kb'; };
+});
+
+angular.module('Application').filter('prettyBinarySize', function () {
+    return function (size, fallback) { return prettyDecimalSize(size, fallback) || '0 KiB'; };
 });
 
 angular.module('Application').filter('prettyDiskSize', function () {
-    return function (size, fallback) { return prettyByteSize(size, fallback) || 'Not available yet'; };
+    return function (size, fallback) { return prettyDecimalSize(size, fallback) || 'Not available yet'; };
 });
 
 angular.module('Application').filter('trKeyFromPeriod', function () {
diff --git a/src/terminal.html b/src/terminal.html
index 19676d39f..389eca2b7 100644
--- a/src/terminal.html
+++ b/src/terminal.html
@@ -101,7 +101,7 @@
           <h4 class="modal-title">{{ 'terminal.upload.title' | tr:{ name: selected.name } }}</h4>
         </div>
         <div class="modal-body">
-          <span><b>{{ uploadProgress.current | prettyByteSize }}</b> (total {{ uploadProgress.total | prettyByteSize }})</span>
+          <span><b>{{ uploadProgress.current | prettyDecimalSize }}</b> (total {{ uploadProgress.total | prettyDecimalSize }})</span>
           <div class="progress progress-striped active">
             <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ 100*(uploadProgress.current/uploadProgress.total) }}%"></div>
           </div>
diff --git a/src/views/app.html b/src/views/app.html
index c6859ffa1..1680689d4 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -924,7 +924,7 @@
           <div class="col-md-12">
             <form role="form" name="resourcesForm" ng-submit="resources.submitMemoryLimit()" autocomplete="off">
               <div class="form-group">
-                <label class="control-label" for="memoryLimit">{{ 'app.resources.memory.title' | tr }} <sup><a ng-href="https://docs.cloudron.io/apps/#memory-limit" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> : <b>{{ resources.memoryLimit | prettyByteSize:'Default (256 MB)' }}</b></label>
+                <label class="control-label" for="memoryLimit">{{ 'app.resources.memory.title' | tr }} <sup><a ng-href="https://docs.cloudron.io/apps/#memory-limit" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> : <b>{{ resources.memoryLimit | prettyBinarySize:'Default (256 MB)' }}</b></label>
                 <div style="padding: 0 10px;">
                   <slider id="memoryLimit" ng-model="resources.memoryLimit" step="134217728" tooltip="hide" ticks="resources.memoryTicks" ticks-snap-bounds="67108864"></slider>
                 </div>
diff --git a/src/views/appstore.html b/src/views/appstore.html
index 0fa5ba2c7..e81d306ae 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -11,7 +11,7 @@
         <br/>
         <span class="appstore-install-meta">{{ 'appstore.installDialog.lastUpdated' | tr:{ date: (appInstall.app.creationDate | prettyDate) } }}</span>
         <br/>
-        <span class="appstore-install-meta">{{ 'appstore.installDialog.memoryRequirement' | tr:{ size: (appInstall.app.manifest.memoryLimit | prettyByteSize:'256 MB') } }}</span>
+        <span class="appstore-install-meta">{{ 'appstore.installDialog.memoryRequirement' | tr:{ size: (appInstall.app.manifest.memoryLimit | prettyBinarySize:'256 MB') } }}</span>
       </div>
       <div class="modal-body">
         <div class="collapse" id="collapseInstallForm" data-toggle="false">
diff --git a/src/views/backups.html b/src/views/backups.html
index 0cfb543ca..33a0f6a1f 100644
--- a/src/views/backups.html
+++ b/src/views/backups.html
@@ -376,7 +376,7 @@
           <div  uib-collapse="!configureBackup.advancedVisible">
 
             <div class="form-group">
-              <label class="control-label">{{ 'backups.configureBackupStorage.memoryLimit' | tr }}: <b>{{ configureBackup.memoryLimit | prettyByteSize:'800 MB' }}</b></label>
+              <label class="control-label">{{ 'backups.configureBackupStorage.memoryLimit' | tr }}: <b>{{ configureBackup.memoryLimit | prettyBinarySize:'800 MB' }}</b></label>
               <p class="small">{{ 'backups.configureBackupStorage.memoryLimitDescription' | tr }}</p>
               <div style="padding: 0 10px;">
                 <slider id="sliderConfigureBackupMemoryLimit" ng-model="configureBackup.memoryLimit" step="134217728" tooltip="hide" ticks="configureBackup.memoryTicks" ticks-snap-bounds="67108864"></slider>
@@ -384,7 +384,7 @@
             </div>
 
             <div class="form-group" ng-show="s3like(configureBackup.provider)">
-              <label class="control-label">{{ 'backups.configureBackupStorage.uploadPartSize' | tr }}: <b>{{ configureBackup.uploadPartSize | prettyByteSize:'Default (50 MB)' }}</b></label>
+              <label class="control-label">{{ 'backups.configureBackupStorage.uploadPartSize' | tr }}: <b>{{ configureBackup.uploadPartSize | prettyBinarySize:'Default (50 MB)' }}</b></label>
               <p class="small">{{ 'backups.configureBackupStorage.uploadPartSizeDescription' | tr }}</p>
               <div style="padding: 0 10px;">
                 <slider id="sliderConfigureBackupUploadPartSize" ng-model="configureBackup.uploadPartSize" step="1048576" tooltip="hide" ticks="configureBackup.uploadPartSizeTicks" ticks-snap-bounds="2097152"></slider>
diff --git a/src/views/email.html b/src/views/email.html
index c979a6d6a..ee6334588 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -155,7 +155,7 @@
           <div class="form-group">
             <label for="storageQuota">
               <input id="storageQuota" type="checkbox" ng-model="mailboxes.edit.storageQuotaEnabled">
-                {{ 'email.editMailboxDialog.enableStorageQuota' | tr }} <b ng-hide="!mailboxes.edit.storageQuotaEnabled">: {{ mailboxes.edit.storageQuota | prettyByteSize }}</b>
+                {{ 'email.editMailboxDialog.enableStorageQuota' | tr }} <b ng-hide="!mailboxes.edit.storageQuotaEnabled">: {{ mailboxes.edit.storageQuota | prettyDecimalSize }}</b>
               </input>
             </label>
             <div style="padding: 0 10px;">
@@ -458,7 +458,7 @@
                     <span ng-repeat="alias in mailbox.aliases"> {{ alias.name + '@' + alias.domain }}</span>
                   </td>
                   <td class="hand no-wrap" ng-click="mailboxes.edit.show(mailbox)">
-                    {{ mailbox.usage | prettyByteSize }} <span ng-show="mailbox.limit">/ {{ mailbox.limit | prettyByteSize }}</span>
+                    {{ mailbox.usage | prettyDecimalSize }} <span ng-show="mailbox.limit">/ {{ mailbox.limit | prettyDecimalSize }}</span>
                   </td>
                   <td class="text-right no-wrap">
                     <button class="btn btn-xs btn-default" ng-click="mailboxes.edit.show(mailbox)"><i class="fa fa-pencil-alt"></i></button>
diff --git a/src/views/emails.html b/src/views/emails.html
index 2cccde43a..df41a2884 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -57,7 +57,7 @@
         <br>
         <form name="maxEmailSizeChangeForm" role="form" novalidate ng-submit="maxEmailSize.submit()" autocomplete="off">
           <div class="form-group">
-            <label class="control-label">{{ 'emails.changeMailSizeDialog.size' | tr }} <b>{{ maxEmailSize.size | prettyDiskSize }}</b></label>
+            <label class="control-label">{{ 'emails.changeMailSizeDialog.size' | tr }} <b>{{ maxEmailSize.size | prettyDecimalSize }}</b></label>
             <slider ng-model="maxEmailSize.size" tooltip="hide" min="1048576" max="1073741824" step="1048576"></slider>
           </div>
           <input class="ng-hide" type="submit"/>
@@ -254,7 +254,7 @@
               </td>
               <td class="elide-table-cell no-padding">
                 <a href="/#/email/{{ domain.domain }}" class="email-domain-list-item">
-                  <span ng-show="domain.inbound && domain.outbound">{{ 'emails.domains.stats' | tr:{ mailboxCount: domain.mailboxCount, usage: (domain.usage | prettyByteSize) } }}</span>
+                  <span ng-show="domain.inbound && domain.outbound">{{ 'emails.domains.stats' | tr:{ mailboxCount: domain.mailboxCount, usage: (domain.usage | prettyDecimalSize) } }}</span>
                   <span ng-show="!domain.inbound && domain.outbound">{{ 'emails.domains.outbound' | tr }}</span>
                   <span ng-show="!domain.inbound && !domain.outbound">{{ 'emails.domains.disabled' | tr }}</span>
                 </a>
@@ -310,7 +310,7 @@
         <span class="text-muted">{{ 'emails.settings.maxMailSize' | tr }}</span>
       </div>
       <div class="col-xs-6 text-right">
-        <span>{{ maxEmailSize.currentSize | prettyDiskSize }} <a href="" ng-click="maxEmailSize.show()"><i class="fa fa-edit text-small"></i></a></span>
+        <span>{{ maxEmailSize.currentSize | prettyDecimalSize }} <a href="" ng-click="maxEmailSize.show()"><i class="fa fa-edit text-small"></i></a></span>
       </div>
       <div class="col-xs-6">
         <span class="text-muted">{{ 'emails.settings.acl' | tr }}</span>
diff --git a/src/views/services.html b/src/views/services.html
index e4008e167..64631f761 100644
--- a/src/views/services.html
+++ b/src/views/services.html
@@ -109,7 +109,7 @@
                     </div>
                   </td>
                   <td class="elide-table-cell text-center">
-                    <span ng-show="service.config.memoryLimit">{{ service.config.memoryLimit | prettyByteSize }}</span>
+                    <span ng-show="service.config.memoryLimit">{{ service.config.memoryLimit | prettyBinarySize }}</span>
                   </td>
                   <td class="text-right no-wrap" style="vertical-align: bottom">
                     <button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="{{ 'services.configureActionTooltip' | tr }}" ng-disabled="!service.config.memoryLimit"><i class="fa fa-pencil-alt"></i></button>
@@ -137,7 +137,7 @@
                     </div>
                   </td>
                   <td class="elide-table-cell text-center">
-                    <span ng-show="service.config.memoryLimit">{{ service.config.memoryLimit | prettyByteSize }}</span>
+                    <span ng-show="service.config.memoryLimit">{{ service.config.memoryLimit | prettyBinarySize }}</span>
                   </td>
                   <td class="text-right no-wrap" style="vertical-align: bottom">
                     <button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="{{ 'services.configureActionTooltip' | tr }}" ng-show="service.config.memoryLimit"><i class="fa fa-pencil-alt"></i></button>
diff --git a/src/views/system.html b/src/views/system.html
index ae3f2f2f9..4043b18b0 100644
--- a/src/views/system.html
+++ b/src/views/system.html
@@ -92,4 +92,4 @@
     </div>
   </div>
 
-</div>
\ No newline at end of file
+</div>