diff --git a/web/images/sprite.png b/web/images/sprite.png
index f9ecf389..d748d17a 100644
Binary files a/web/images/sprite.png and b/web/images/sprite.png differ
diff --git a/web/js/file_manager.js b/web/js/file_manager.js
index 7a532f87..b4bf71da 100644
--- a/web/js/file_manager.js
+++ b/web/js/file_manager.js
@@ -25,7 +25,6 @@ FM.ORDER_BOX_B = $('.context-menu.sort-order.tab-b');
 FM.ORDER_TAB_A = 'type_asc';
 FM.ORDER_TAB_B = 'type_asc';
 
-
 FM.TAB_A_CURRENT_PATH = GLOBAL.TAB_A__PATH;
 FM.TAB_B_CURRENT_PATH = GLOBAL.TAB_B_PATH;
 
@@ -156,11 +155,11 @@ FM.getFileType = function(name) {
 
 FM.sortItems = function(items, box) {
     var sorted = [];
-    
+
     var files    = [];
     var dirs     = [];
     var combined = []
-    
+
     $.each(items, function(i, o) {
         if (i > 0) { // i == 0 means first .. element in list
             if (FM.isItemFile(o)) {
@@ -175,9 +174,9 @@ FM.sortItems = function(items, box) {
     //    var sort_type = $(box).parents('.window').find('.menu').find('.sort-by-v').val();
     var sort_type = FM.ORDER_TAB_A;
     if($(box).closest('.window').find('.menu').hasClass('menu-right')){
-	sort_type = FM.ORDER_TAB_B;
+      sort_type = FM.ORDER_TAB_B;
     }
-    
+
     switch (sort_type) {
         case 'type_asc':
             files.sort(function (a, b) {
@@ -203,7 +202,7 @@ FM.sortItems = function(items, box) {
                 var size_b = parseInt(b.size, 10);
                 return ((size_a < size_b) ? -1 : ((size_a > size_b) ? 1 : 0));
             });
-            
+
             sorted = $.merge(dirs, files);
             break;
         case 'size_desc':
@@ -212,7 +211,7 @@ FM.sortItems = function(items, box) {
                 var size_b = parseInt(b.size, 10);
                 return ((size_a > size_b) ? -1 : ((size_a < size_b) ? 1 : 0));
             });
-            
+
             sorted = $.merge(dirs, files);
             break;
         case 'date_asc':
@@ -235,9 +234,9 @@ FM.sortItems = function(items, box) {
                 var date_b = Date.parseDate(b.date + ' ' + time_b, 'yy-m-d h:i:s');
                 return ((date_a > date_b) ? -1 : ((date_a < date_b) ? 1 : 0));
             });
-            
+
             break;
-            
+
         case 'name_asc':
             sorted = $.merge(dirs, files);
             sorted.sort(function (a, b) {
@@ -250,7 +249,7 @@ FM.sortItems = function(items, box) {
             sorted.sort(function (a, b) {
                 return a.name.localeCompare(b.name);
             });
-            
+
             sorted = sorted.reverse();
             break;
         default:
@@ -263,8 +262,8 @@ FM.sortItems = function(items, box) {
             sorted = $.merge(dirs, files);
             break;
     }
-    
-    
+
+
     sorted = $.merge([items[0]], sorted);
 
     return sorted;
diff --git a/web/js/pages/add.mail_acc.js b/web/js/pages/add.mail_acc.js
index 5b612caa..19d1e192 100644
--- a/web/js/pages/add.mail_acc.js
+++ b/web/js/pages/add.mail_acc.js
@@ -1,7 +1,7 @@
 App.Actions.MAIL_ACC.enable_unlimited = function(elm, source_elm) {
     $(elm).data('checked', true);
     $(elm).data('prev_value', $(elm).val()); // save prev value in order to restore if needed
-    $(elm).val(App.Constants.UNLIM_VALUE);
+    $(elm).val(App.Constants.UNLIM_TRANSLATED_VALUE);
     $(elm).attr('disabled', true);
     $(source_elm).css('opacity', '1');
 }
@@ -70,6 +70,9 @@ App.Listeners.MAIL_ACC.checkbox_unlimited_feature();
 $('form[name="v_quota"]').bind('submit', function(evt) {
     $('input:disabled').each(function(i, elm) {
         $(elm).attr('disabled', false);
+        if (App.Helpers.isUnlimitedValue($(elm).val())) {
+            $(elm).val(App.Constants.UNLIM_VALUE);
+        }
     });
 });
 
diff --git a/web/js/pages/add.package.js b/web/js/pages/add.package.js
index 6aa773db..beb5fe4d 100644
--- a/web/js/pages/add.package.js
+++ b/web/js/pages/add.package.js
@@ -1,7 +1,7 @@
 App.Actions.PACKAGE.enable_unlimited = function(elm, source_elm) {
     $(elm).data('checked', true);
     $(elm).data('prev_value', $(elm).val()); // save prev value in order to restore if needed
-    $(elm).val(App.Constants.UNLIM_VALUE);
+    $(elm).val(App.Constants.UNLIM_TRANSLATED_VALUE);
     $(elm).attr('disabled', true);
     $(source_elm).css('opacity', '1');
 }
@@ -70,6 +70,9 @@ App.Listeners.PACKAGE.checkbox_unlimited_feature();
 $('form[name="v_add_package"]').bind('submit', function(evt) {
     $('input:disabled').each(function(i, elm) {
         $(elm).attr('disabled', false);
+        if (App.Helpers.isUnlimitedValue($(elm).val())) {
+            $(elm).val(App.Constants.UNLIM_VALUE);
+        }
     });
 });
 
diff --git a/web/js/pages/edit.mail_acc.js b/web/js/pages/edit.mail_acc.js
index 5b612caa..19d1e192 100644
--- a/web/js/pages/edit.mail_acc.js
+++ b/web/js/pages/edit.mail_acc.js
@@ -1,7 +1,7 @@
 App.Actions.MAIL_ACC.enable_unlimited = function(elm, source_elm) {
     $(elm).data('checked', true);
     $(elm).data('prev_value', $(elm).val()); // save prev value in order to restore if needed
-    $(elm).val(App.Constants.UNLIM_VALUE);
+    $(elm).val(App.Constants.UNLIM_TRANSLATED_VALUE);
     $(elm).attr('disabled', true);
     $(source_elm).css('opacity', '1');
 }
@@ -70,6 +70,9 @@ App.Listeners.MAIL_ACC.checkbox_unlimited_feature();
 $('form[name="v_quota"]').bind('submit', function(evt) {
     $('input:disabled').each(function(i, elm) {
         $(elm).attr('disabled', false);
+        if (App.Helpers.isUnlimitedValue($(elm).val())) {
+            $(elm).val(App.Constants.UNLIM_VALUE);
+        }
     });
 });
 
diff --git a/web/js/pages/edit.package.js b/web/js/pages/edit.package.js
index b1f2cb34..301a9182 100644
--- a/web/js/pages/edit.package.js
+++ b/web/js/pages/edit.package.js
@@ -1,7 +1,7 @@
 App.Actions.PACKAGE.enable_unlimited = function(elm, source_elm) {
     $(elm).data('checked', true);
     $(elm).data('prev_value', $(elm).val()); // save prev value in order to restore if needed
-    $(elm).val(App.Constants.UNLIM_VALUE);
+    $(elm).val(App.Constants.UNLIM_TRANSLATED_VALUE);
     $(elm).attr('disabled', true);
     $(source_elm).css('opacity', '1');
 }
@@ -70,6 +70,9 @@ App.Listeners.PACKAGE.checkbox_unlimited_feature();
 $('form[name="v_edit_package"]').bind('submit', function(evt) {
     $('input:disabled').each(function(i, elm) {
         $(elm).attr('disabled', false);
+        if (App.Helpers.isUnlimitedValue($(elm).val())) {
+            $(elm).val(App.Constants.UNLIM_VALUE);
+        }
     });
 });