diff --git a/sqlitebrowser/.gitignore b/sqlitebrowser/.gitignore
index 8d4183af..3e00349c 100644
--- a/sqlitebrowser/.gitignore
+++ b/sqlitebrowser/.gitignore
@@ -1,4 +1,4 @@
-sqlitebrowser
+
 Makefile
 .moc/
 .obj/
diff --git a/sqlitebrowser/sqlitebrowser/form1.h b/sqlitebrowser/sqlitebrowser/form1.h
index 41975f70..27f82d52 100644
--- a/sqlitebrowser/sqlitebrowser/form1.h
+++ b/sqlitebrowser/sqlitebrowser/form1.h
@@ -125,16 +125,19 @@ public:
         }
         //TODO get from settings and save last position
         mainForm->resize(702, 552);
+
+        //** New File
         fileNewAction = new QAction(mainForm);
         fileNewAction->setObjectName(QString::fromUtf8("fileNewAction"));
         fileNewAction->setName("fileNewAction");
-        const QIcon icon = QIcon(qPixmapFromMimeSource("new.png"));
-        fileNewAction->setIcon(icon);
+        fileNewAction->setIcon(QIcon(":/icons/db_new"));
+
+        //** Open File
         fileOpenAction = new QAction(mainForm);
         fileOpenAction->setObjectName(QString::fromUtf8("fileOpenAction"));
         fileOpenAction->setName("fileOpenAction");
-        const QIcon icon1 = QIcon(qPixmapFromMimeSource("open.png"));
-        fileOpenAction->setIcon(icon1);
+        fileOpenAction->setIcon(QIcon(":/icons/db_open"));
+
         fileExitAction = new QAction(mainForm);
         fileExitAction->setObjectName(QString::fromUtf8("fileExitAction"));
         fileExitAction->setName("fileExitAction");
@@ -158,10 +161,13 @@ public:
         helpAboutAction = new QAction(mainForm);
         helpAboutAction->setObjectName(QString::fromUtf8("helpAboutAction"));
         helpAboutAction->setName("helpAboutAction");
+
+        //** Close Database ??
         fileCloseAction = new QAction(mainForm);
         fileCloseAction->setObjectName(QString::fromUtf8("fileCloseAction"));
         fileCloseAction->setName("fileCloseAction");
         fileCloseAction->setEnabled(false);
+
         newRecordAction = new QAction(mainForm);
         newRecordAction->setObjectName(QString::fromUtf8("newRecordAction"));
         newRecordAction->setName("newRecordAction");
@@ -192,48 +198,59 @@ public:
         fileSaveAction->setEnabled(false);
         const QIcon icon5 = QIcon(qPixmapFromMimeSource("save.png"));
         fileSaveAction->setIcon(icon5);
+
+        //** Db Revert
         fileRevertAction = new QAction(mainForm);
         fileRevertAction->setObjectName(QString::fromUtf8("fileRevertAction"));
         fileRevertAction->setName("fileRevertAction");
         fileRevertAction->setEnabled(false);
-        const QIcon icon6 = QIcon(qPixmapFromMimeSource("revert.png"));
-        fileRevertAction->setIcon(icon6);
+        fileRevertAction->setIcon(QIcon("icons/db_revert"));
         //fileImportAction = new QAction(mainForm);
         //fileImportAction->setObjectName(QString::fromUtf8("fileImportAction"));
         //fileImportAction->setName("fileImportAction");
         //fileExportAction = new QAction(mainForm);
         //fileExportAction->setObjectName(QString::fromUtf8("fileExportAction"));
         //fileExportAction->setName("fileExportAction");
+
+        //** Create Table
         editCreateTableAction = new QAction(mainForm);
         editCreateTableAction->setObjectName(QString::fromUtf8("editCreateTableAction"));
         editCreateTableAction->setName("editCreateTableAction");
         editCreateTableAction->setEnabled(false);
-        const QIcon icon7 = QIcon(qPixmapFromMimeSource("create_table.png"));
-        editCreateTableAction->setIcon(icon7);
+        //const QIcon icon7 = QIcon(qPixmapFromMimeSource("create_table.png"));
+        editCreateTableAction->setIcon(QIcon(":/icons/table_create"));
+
+        //** Delete table
         editDeleteTableAction = new QAction(mainForm);
         editDeleteTableAction->setObjectName(QString::fromUtf8("editDeleteTableAction"));
         editDeleteTableAction->setName("editDeleteTableAction");
         editDeleteTableAction->setEnabled(false);
-        const QIcon icon8 = QIcon(qPixmapFromMimeSource("delete_table.png"));
-        editDeleteTableAction->setIcon(icon8);
+        //const QIcon icon8 = QIcon(qPixmapFromMimeSource("delete_table.png"));
+        editDeleteTableAction->setIcon(QIcon(":/icons/table_delete"));
+
+        //** Modify Table
         editModifyTableAction = new QAction(mainForm);
         editModifyTableAction->setObjectName(QString::fromUtf8("editModifyTableAction"));
         editModifyTableAction->setName("editModifyTableAction");
         editModifyTableAction->setEnabled(false);
-        const QIcon icon9 = QIcon(qPixmapFromMimeSource("modify_table.png"));
-        editModifyTableAction->setIcon(icon9);
+       // const QIcon icon9 = QIcon(qPixmapFromMimeSource("modify_table.png"));
+        editModifyTableAction->setIcon(QIcon(":/icons/table_modify"));
+
+        //** Create Index
         editCreateIndexAction = new QAction(mainForm);
         editCreateIndexAction->setObjectName(QString::fromUtf8("editCreateIndexAction"));
         editCreateIndexAction->setName("editCreateIndexAction");
         editCreateIndexAction->setEnabled(false);
-        const QIcon icon10 = QIcon(qPixmapFromMimeSource("create_index.png"));
-        editCreateIndexAction->setIcon(icon10);
+        //const QIcon icon10 = QIcon(qPixmapFromMimeSource("create_index.png"));
+        editCreateIndexAction->setIcon(QIcon(":/icons/index_create"));
+
         editDeleteIndexAction = new QAction(mainForm);
         editDeleteIndexAction->setObjectName(QString::fromUtf8("editDeleteIndexAction"));
         editDeleteIndexAction->setName("editDeleteIndexAction");
         editDeleteIndexAction->setEnabled(false);
-        const QIcon icon11 = QIcon(qPixmapFromMimeSource("delete_index.png"));
-        editDeleteIndexAction->setIcon(icon11);
+        //const QIcon icon11 = QIcon(qPixmapFromMimeSource("delete_index.png"));
+        editDeleteIndexAction->setIcon(QIcon(":/icons/index_delete"));
+
         fileImportSQLAction = new QAction(mainForm);
         fileImportSQLAction->setObjectName(QString::fromUtf8("fileImportSQLAction"));
         fileImportSQLAction->setName("fileImportSQLAction");
diff --git a/sqlitebrowser/sqlitebrowser/icons/database_add.png b/sqlitebrowser/sqlitebrowser/icons/database_add.png
new file mode 100755
index 00000000..802bd6cd
Binary files /dev/null and b/sqlitebrowser/sqlitebrowser/icons/database_add.png differ
diff --git a/sqlitebrowser/sqlitebrowser/icons/database_go.png b/sqlitebrowser/sqlitebrowser/icons/database_go.png
new file mode 100755
index 00000000..61a8556c
Binary files /dev/null and b/sqlitebrowser/sqlitebrowser/icons/database_go.png differ
diff --git a/sqlitebrowser/sqlitebrowser/icons/database_refresh.png b/sqlitebrowser/sqlitebrowser/icons/database_refresh.png
new file mode 100755
index 00000000..ff803be1
Binary files /dev/null and b/sqlitebrowser/sqlitebrowser/icons/database_refresh.png differ
diff --git a/sqlitebrowser/sqlitebrowser/icons/database_save.png b/sqlitebrowser/sqlitebrowser/icons/database_save.png
new file mode 100755
index 00000000..44c06ddd
Binary files /dev/null and b/sqlitebrowser/sqlitebrowser/icons/database_save.png differ
diff --git a/sqlitebrowser/sqlitebrowser/icons/icons.qrc b/sqlitebrowser/sqlitebrowser/icons/icons.qrc
new file mode 100644
index 00000000..7d77c4a1
--- /dev/null
+++ b/sqlitebrowser/sqlitebrowser/icons/icons.qrc
@@ -0,0 +1,13 @@
+<RCC>
+    <qresource prefix="/icons">
+        <file alias="db_new">database_add.png</file>
+        <file alias="db_open">database_go.png</file>
+        <file alias="db_revert">database_refresh.png</file>
+        <file>database_save.png</file>
+        <file alias="table_create">table_add.png</file>
+        <file alias="table_delete">table_delete.png</file>
+        <file alias="table_modify">table_edit.png</file>
+        <file alias="index_create">tag_blue_add.png</file>
+        <file alias="index_delete">tag_blue_delete.png</file>
+    </qresource>
+</RCC>
diff --git a/sqlitebrowser/sqlitebrowser/icons/table_add.png b/sqlitebrowser/sqlitebrowser/icons/table_add.png
new file mode 100755
index 00000000..2a3e5c4d
Binary files /dev/null and b/sqlitebrowser/sqlitebrowser/icons/table_add.png differ
diff --git a/sqlitebrowser/sqlitebrowser/icons/table_delete.png b/sqlitebrowser/sqlitebrowser/icons/table_delete.png
new file mode 100755
index 00000000..b85916d9
Binary files /dev/null and b/sqlitebrowser/sqlitebrowser/icons/table_delete.png differ
diff --git a/sqlitebrowser/sqlitebrowser/icons/table_edit.png b/sqlitebrowser/sqlitebrowser/icons/table_edit.png
new file mode 100755
index 00000000..bfcb0249
Binary files /dev/null and b/sqlitebrowser/sqlitebrowser/icons/table_edit.png differ
diff --git a/sqlitebrowser/sqlitebrowser/icons/tag_blue_add.png b/sqlitebrowser/sqlitebrowser/icons/tag_blue_add.png
new file mode 100755
index 00000000..f135248f
Binary files /dev/null and b/sqlitebrowser/sqlitebrowser/icons/tag_blue_add.png differ
diff --git a/sqlitebrowser/sqlitebrowser/icons/tag_blue_delete.png b/sqlitebrowser/sqlitebrowser/icons/tag_blue_delete.png
new file mode 100755
index 00000000..9fbae672
Binary files /dev/null and b/sqlitebrowser/sqlitebrowser/icons/tag_blue_delete.png differ
diff --git a/sqlitebrowser/sqlitebrowser/sqlitebrowser.pro b/sqlitebrowser/sqlitebrowser/sqlitebrowser.pro
index 80845e37..141424cb 100755
--- a/sqlitebrowser/sqlitebrowser/sqlitebrowser.pro
+++ b/sqlitebrowser/sqlitebrowser/sqlitebrowser.pro
@@ -78,3 +78,4 @@ mac {
     CONFIG += x86 \
         ppc
 }
+RESOURCES += icons/icons.qrc