diff --git a/share/keepass/icons/clientic.png b/share/keepass/icons/clientic.png
index e970767..8585b79 100755
Binary files a/share/keepass/icons/clientic.png and b/share/keepass/icons/clientic.png differ
diff --git a/src/dialogs/EditEntryDlg.cpp b/src/dialogs/EditEntryDlg.cpp
index 970cc61..7765c20 100755
--- a/src/dialogs/EditEntryDlg.cpp
+++ b/src/dialogs/EditEntryDlg.cpp
@@ -132,7 +132,7 @@ if(event->spontaneous()==false){
 }
 
 void CEditEntryDlg::InitIconComboBox(){
-for(int i=0;i<52;i++){
+for(int i=0;i<NUM_CLIENT_ICONS;i++){
 Combo_IconPicker->insertItem(EntryIcons[i],"",i);
 }
 Combo_IconPicker->setCurrentItem(entry->ImageID);
@@ -229,7 +229,7 @@ if(QString::compare(Edit_Password_w->text(),Edit_Password->text().mid(0,(Edit_Pa
 Edit_Password_w->setPaletteBackgroundColor(QColor(255,125,125));
 }else
 {
-Edit_Password_w->setPaletteBackgroundColor(QColor(255,255,255)); ///@FIXME Standart-Hintergrundfarbe nicht weiß
+Edit_Password_w->setPaletteBackgroundColor(QColor(255,255,255)); ///@FIXME Standard-Hintergrundfarbe nicht weiß
 }
 
 
@@ -243,7 +243,7 @@ Edit_Password_w->setPaletteBackgroundColor(QColor(255,125,125));
 }
 else
 {
-Edit_Password_w->setPaletteBackgroundColor(QColor(255,255,255)); ///@FIXME Standart-Hintergrundfarbe nicht weiß
+Edit_Password_w->setPaletteBackgroundColor(QColor(255,255,255)); ///@FIXME Standard-Hintergrundfarbe nicht weiß
 }
 
 
diff --git a/src/dialogs/EditGroupDlg.cpp b/src/dialogs/EditGroupDlg.cpp
index 4423883..bc1a2c9 100755
--- a/src/dialogs/EditGroupDlg.cpp
+++ b/src/dialogs/EditGroupDlg.cpp
@@ -43,7 +43,7 @@ CEditGroupDialog::~CEditGroupDialog()
 void CEditGroupDialog::showEvent(QShowEvent *event){
 if(event->spontaneous()==false){
 EditTitle->setText(GroupName);
-for(int i=0;i<52;i++){
+for(int i=0;i<NUM_CLIENT_ICONS;i++){
 ComboIconPicker->insertItem(EntryIcons[i],"",i);
 }
 ComboIconPicker->setCurrentItem(IconID);
diff --git a/src/main.cpp b/src/main.cpp
index f5dd4db..0cb9f52 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -211,7 +211,7 @@ QPixmap tmpImg;
 //-----------------------
 loadImg("clientic.png",tmpImg);
 EntryIcons=new QPixmap[NUM_CLIENT_ICONS];
-for(int i=0;i<52;i++){
+for(int i=0;i<NUM_CLIENT_ICONS;i++){
 EntryIcons[i]=tmpImg.copy(i*16,0,16,16);}
 //--------------------------
 loadImg("key.png",tmpImg);
diff --git a/src/main.h b/src/main.h
index 7cf801b..b570a6f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -28,7 +28,7 @@
 #include "PwmConfig.h"
 
 #define KEEPASS_VERSION "0.2.0"
-#define NUM_CLIENT_ICONS 52
+#define NUM_CLIENT_ICONS 62
 
 void createBanner(QLabel *Banner,QPixmap* symbol,QString text);
 void createBanner(QLabel *Banner,QPixmap* symbol,QString text,QColor color1,QColor color2,QColor textcolor);