diff --git a/src/Database.h b/src/Database.h
index 8e25088..0942847 100644
--- a/src/Database.h
+++ b/src/Database.h
@@ -77,7 +77,7 @@ static bool UI_ExpandByDefault;
 #define ALGO_AES         		0
 #define ALGO_TWOFISH			1
 
-class Database{
+class Database:public QObject{
 public:
  Database();
  virtual ~Database(){};
diff --git a/src/PwManager.cpp b/src/PwManager.cpp
index bf72406..106c3c0 100755
--- a/src/PwManager.cpp
+++ b/src/PwManager.cpp
@@ -343,6 +343,7 @@ return CustomIcons[i-BUILTIN_ICONS];
 
 void PwDatabase::addIcon(const QPixmap& icon){
 CustomIcons << icon;
+emit modified();
 }
 
 
diff --git a/src/PwManager.h b/src/PwManager.h
index 16730b9..1bb3684 100755
--- a/src/PwManager.h
+++ b/src/PwManager.h
@@ -41,7 +41,7 @@
 #include "Database.h"
 
 
-class PwDatabase:QObject,public Database{
+class PwDatabase:public Database{
  Q_OBJECT
 public:
  PwDatabase();
@@ -102,6 +102,9 @@ private:
  QList<QPixmap> CustomIcons;
  QList<CEntry> UnkownMetaStreams;
 
+signals:
+void modified();
+
 };
 
 
diff --git a/src/dialogs/EditGroupDlg.cpp b/src/dialogs/EditGroupDlg.cpp
index f3e31b8..1559c0e 100755
--- a/src/dialogs/EditGroupDlg.cpp
+++ b/src/dialogs/EditGroupDlg.cpp
@@ -67,5 +67,12 @@ done(0);
 
 void CEditGroupDialog::OnIconDlg(){
 CSelectIconDlg dlg(db,this);
-dlg.exec();
+int r=dlg.exec();
+if(r!=-1){
+	ComboIconPicker->clear();
+	for(int i=0;i<db->numIcons();i++)
+		ComboIconPicker->insertItem(db->icon(i),"",i);
+	IconID=r;
+	ComboIconPicker->setCurrentItem(IconID);
+}
 }
diff --git a/src/dialogs/SelectIconDlg.cpp b/src/dialogs/SelectIconDlg.cpp
index 59d6049..b450608 100644
--- a/src/dialogs/SelectIconDlg.cpp
+++ b/src/dialogs/SelectIconDlg.cpp
@@ -31,14 +31,24 @@
 CSelectIconDlg::CSelectIconDlg(Database* database,QWidget* parent,const char* name, bool modal, Qt::WFlags fl):QDialog(parent,name,modal,fl){
 setupUi(this);
 db=database;
-
 connect(Button_AddIcon, SIGNAL(clicked()), this, SLOT(OnAddIcon()));
+connect(Button_PickIcon, SIGNAL(clicked()), this, SLOT(OnPickIcon()));
+connect(Button_Cancel, SIGNAL(clicked()), this, SLOT(OnCancel()));
+CtxMenu=new QMenu(this);
+DeleteAction=CtxMenu->addAction(*Icon_EditDelete,tr("Delete"));
+CustomIconsModified=false;
+updateView();
+}
 
+void CSelectIconDlg::updateView(){
+List->clear();
 for(int i=0; i<db->numIcons(); i++){
+	QListWidgetItem* item;
 	if(i<BUILTIN_ICONS)
-		List->addItem(new QListWidgetItem(QIcon(db->icon(i)),QString::number(i)));
+		List->addItem(item=new QListWidgetItem(QIcon(db->icon(i)),QString::number(i)));
 	else
-		List->addItem(new QListWidgetItem(QIcon(db->icon(i)),"["+QString::number(i)+"]"));
+		List->addItem(item=new QListWidgetItem(QIcon(db->icon(i)),"["+QString::number(i)+"]"));
+	item->setData(32,i);
 }
 }
 
@@ -55,4 +65,27 @@ for(int i=0;i<filenames.size();i++){
 }
 if(errors.size())
 	QMessageBox::warning(this,tr("Error"),tr("An error occured while loading the icon(s):\n"));
+CustomIconsModified=true;
+updateView();
+}
+
+void CSelectIconDlg::contextMenuEvent(QContextMenuEvent *event){
+
+QListWidgetItem* item=List->itemAt(List->mapFromParent(event->pos()));
+
+if(!item)return;
+if(item->data(32).toInt()<BUILTIN_ICONS)
+	DeleteAction->setDisabled(true);
+else
+	DeleteAction->setDisabled(false);
+event->accept();
+CtxMenu->popup(event->globalPos());
+}
+
+void CSelectIconDlg::OnPickIcon(){
+done(List->currentItem()->data(32).toInt());
+}
+
+void CSelectIconDlg::OnCancel(){
+done(-1);
 }
\ No newline at end of file
diff --git a/src/dialogs/SelectIconDlg.h b/src/dialogs/SelectIconDlg.h
index 23e640f..ada7199 100644
--- a/src/dialogs/SelectIconDlg.h
+++ b/src/dialogs/SelectIconDlg.h
@@ -21,6 +21,9 @@
 #ifndef _SELECT_ICON_DLG_
 #define _SELECT_ICON_DLG_
 
+#include <QContextMenuEvent>
+#include <QMenu>
+#include <QAction>
 #include "main.h"
 #include "Database.h"
 #include "ui_SelectIconDlg.h"
@@ -29,13 +32,22 @@ class CSelectIconDlg:public QDialog, public Ui_SelectIconDlg{
  Q_OBJECT
 public:
  CSelectIconDlg(Database* db,QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WFlags fl = 0);
+ bool CustomIconsModified;
 
 public slots:
  void OnAddIcon();
+ void OnPickIcon();
+ void OnCancel();
+
 
 private:
  Database* db;
+ void updateView();
+ QMenu* CtxMenu;
+ QAction* DeleteAction;
 
+protected:
+ virtual void contextMenuEvent(QContextMenuEvent *event);
 
 };
 
diff --git a/src/forms/SelectIconDlg.ui b/src/forms/SelectIconDlg.ui
index 7fede46..a8e978f 100644
--- a/src/forms/SelectIconDlg.ui
+++ b/src/forms/SelectIconDlg.ui
@@ -8,105 +8,104 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>468</width>
-    <height>272</height>
+    <width>478</width>
+    <height>280</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
-  <widget class="QListWidget" name="List" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>451</width>
-     <height>211</height>
-    </rect>
-   </property>
-   <property name="horizontalScrollBarPolicy" >
-    <enum>Qt::ScrollBarAlwaysOff</enum>
-   </property>
-   <property name="selectionMode" >
-    <enum>QAbstractItemView::ExtendedSelection</enum>
-   </property>
-   <property name="iconSize" >
-    <size>
-     <width>16</width>
-     <height>16</height>
-    </size>
-   </property>
-   <property name="textElideMode" >
-    <enum>Qt::ElideRight</enum>
-   </property>
-   <property name="movement" >
-    <enum>QListView::Static</enum>
-   </property>
-   <property name="flow" >
-    <enum>QListView::LeftToRight</enum>
-   </property>
-   <property name="gridSize" >
-    <size>
-     <width>32</width>
-     <height>44</height>
-    </size>
-   </property>
-   <property name="viewMode" >
-    <enum>QListView::IconMode</enum>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
    </property>
-  </widget>
-  <widget class="QWidget" name="layoutWidget" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>230</y>
-     <width>451</width>
-     <height>33</height>
-    </rect>
+   <property name="spacing" >
+    <number>6</number>
    </property>
-   <layout class="QHBoxLayout" >
-    <property name="margin" >
-     <number>0</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <item>
-     <widget class="QPushButton" name="Button_AddIcon" >
-      <property name="text" >
-       <string>Add Custom Icon...</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" >
-       <size>
-        <width>131</width>
-        <height>31</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item>
-     <widget class="QPushButton" name="Button_PickIcon" >
-      <property name="text" >
-       <string>Pick</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="Button_Cancel" >
-      <property name="text" >
-       <string>Cancel</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
+   <item row="0" column="0" >
+    <layout class="QGridLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="1" column="0" >
+      <widget class="QPushButton" name="Button_AddIcon" >
+       <property name="text" >
+        <string>Add Custom Icon...</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2" >
+      <widget class="QPushButton" name="Button_PickIcon" >
+       <property name="text" >
+        <string>Pick</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3" >
+      <widget class="QPushButton" name="Button_Cancel" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>131</width>
+         <height>31</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="0" colspan="4" >
+      <widget class="QListWidget" name="List" >
+       <property name="iconSize" >
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="movement" >
+        <enum>QListView::Static</enum>
+       </property>
+       <property name="flow" >
+        <enum>QListView::LeftToRight</enum>
+       </property>
+       <property name="isWrapping" stdset="0" >
+        <bool>true</bool>
+       </property>
+       <property name="resizeMode" >
+        <enum>QListView::Adjust</enum>
+       </property>
+       <property name="gridSize" >
+        <size>
+         <width>32</width>
+         <height>44</height>
+        </size>
+       </property>
+       <property name="viewMode" >
+        <enum>QListView::IconMode</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
  </widget>
  <pixmapfunction></pixmapfunction>
  <resources/>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ab7fcd4..082db63 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -267,6 +267,7 @@ Q_ASSERT(r==1);
 db = new PwDatabase();
 GroupView->db=db;
 EntryView->db=db;
+connect(db,SIGNAL(modified()),this,SLOT(OnFileModified()));
 if(PasswordDlg.password!="" && PasswordDlg.keyfile=="")
 	db->CalcMasterKeyByPassword(PasswordDlg.password);
 if(PasswordDlg.password=="" && PasswordDlg.keyfile!="")