diff --git a/ressources/icons/Search-icon.png b/ressources/icons/Search-icon.png
index 69bf37e..8fa0d16 100644
Binary files a/ressources/icons/Search-icon.png and b/ressources/icons/Search-icon.png differ
diff --git a/src/model/Database.cpp b/src/model/Database.cpp
index 3c07537..7fe6165 100644
--- a/src/model/Database.cpp
+++ b/src/model/Database.cpp
@@ -1047,6 +1047,7 @@ bool Database::LoadCategory(const wxString& id, const wxString& name, Category&
         category.backcolor = wxColour(set.GetAsString(wxT("backcolor")));
         category.forecolor = wxColour(set.GetAsString(wxT("forecolor")));
         category.font = set.GetAsString(wxT("font"));
+        category.fix_cost = set.GetBool(wxT("fix_cost"));
 	ret = true;
     }
 
diff --git a/src/model/User.cpp b/src/model/User.cpp
index e168932..5299bb1 100644
--- a/src/model/User.cpp
+++ b/src/model/User.cpp
@@ -85,7 +85,7 @@ wxString User::GetCategoryId(const wxString& catName)
     Category cat;
 
     for (it=_categories.begin(); it !=_categories.end(); it++)
-        if (it->name == catName)
+        if (wxGetTranslation(it->name) == catName)
             return it->id;
 
     if ( _db->LoadCategory(wxT(""), catName, cat))
diff --git a/src/view/grid/GridAccount.cpp b/src/view/grid/GridAccount.cpp
index 1b61ba1..e961f62 100644
--- a/src/view/grid/GridAccount.cpp
+++ b/src/view/grid/GridAccount.cpp
@@ -25,14 +25,14 @@
         SetCellTextColour(row, i, forecolor);				\
     }
 
-#define SET_ROW_FONT(row, font)  for(int i=0; i<NUMBER_COLS_OPS; i++) \
+#define SET_ROW_FONT(row, font)  for(int i=0; i<NUMBER_COLS_OPS; i++)	\
     {									\
-        SetCellFont(row, i, font);        \
+        SetCellFont(row, i, font);					\
     }
 
 #define UNESCAPE_CHARS(s) {                             \
-            s.Replace(wxT("\\\""), wxT("\""), true);    \
-            s.Replace(wxT("\\\'"), wxT("\'"), true);    \
+	s.Replace(wxT("\\\""), wxT("\""), true);	\
+	s.Replace(wxT("\\\'"), wxT("\'"), true);	\
     }
 
 BEGIN_EVENT_TABLE(GridAccount, wxGrid)
@@ -1492,6 +1492,12 @@ void GridAccount::MassUpdate(std::vector<int>& rows, updateOperationFunc func, v
     std::vector<Operation>::iterator it;
     Operation op, op2;
 
+    _parent->Disable();
+
+    _parent->SetCursor(wxCursor(wxCURSOR_ARROWWAIT));
+
+    _parent->Update();
+
     if (rows.size())
     {
 	for(i=0; i<(int)rows.size(); i++)
@@ -1527,4 +1533,8 @@ void GridAccount::MassUpdate(std::vector<int>& rows, updateOperationFunc func, v
     LoadOperations(_operations, false, false, 0, 0);
 
     Layout();
+
+    _parent->Enable();
+
+    _parent->SetCursor(wxNullCursor);
 }