diff --git a/icons/icons.qrc b/icons/icons.qrc
index 57624c16c..1f3fd2899 100644
--- a/icons/icons.qrc
+++ b/icons/icons.qrc
@@ -58,5 +58,17 @@
         <file>tri-up.png</file>
         <file>hand.png</file>
         <file>hand-disabled.png</file>
+        <file>treeview.png</file>
+        <file>treeview-disabled.png</file>
+        <file>iconview.png</file>
+        <file>iconview-disabled.png</file>
+        <file>open.png</file>
+        <file>open-disabled.png</file>
+        <file>save.png</file>
+        <file>save-disabled.png</file>
+        <file>undo.png</file>
+        <file>undo-disabled.png</file>
+        <file>redo.png</file>
+        <file>redo-disabled.png</file>
     </qresource>
 </RCC>
diff --git a/icons/iconview-disabled.png b/icons/iconview-disabled.png
new file mode 100644
index 000000000..37ea7f6e9
Binary files /dev/null and b/icons/iconview-disabled.png differ
diff --git a/icons/iconview.png b/icons/iconview.png
new file mode 100644
index 000000000..37ea7f6e9
Binary files /dev/null and b/icons/iconview.png differ
diff --git a/icons/new-disabled.png b/icons/new-disabled.png
new file mode 100644
index 000000000..6d9b6ab30
Binary files /dev/null and b/icons/new-disabled.png differ
diff --git a/icons/new.png b/icons/new.png
new file mode 100644
index 000000000..e69e392c5
Binary files /dev/null and b/icons/new.png differ
diff --git a/icons/open-disabled.png b/icons/open-disabled.png
new file mode 100644
index 000000000..40b12f137
Binary files /dev/null and b/icons/open-disabled.png differ
diff --git a/icons/open.png b/icons/open.png
new file mode 100644
index 000000000..0720fee85
Binary files /dev/null and b/icons/open.png differ
diff --git a/icons/redo-disabled.png b/icons/redo-disabled.png
new file mode 100644
index 000000000..b79499e42
Binary files /dev/null and b/icons/redo-disabled.png differ
diff --git a/icons/redo.png b/icons/redo.png
new file mode 100644
index 000000000..cff5d8d5c
Binary files /dev/null and b/icons/redo.png differ
diff --git a/icons/save-disabled.png b/icons/save-disabled.png
new file mode 100644
index 000000000..c65944d30
Binary files /dev/null and b/icons/save-disabled.png differ
diff --git a/icons/save.png b/icons/save.png
new file mode 100644
index 000000000..ca3ef3f61
Binary files /dev/null and b/icons/save.png differ
diff --git a/icons/treeview-disabled.png b/icons/treeview-disabled.png
new file mode 100644
index 000000000..f8fa8c2ae
Binary files /dev/null and b/icons/treeview-disabled.png differ
diff --git a/icons/treeview.png b/icons/treeview.png
new file mode 100644
index 000000000..98c0e2c33
Binary files /dev/null and b/icons/treeview.png differ
diff --git a/icons/undo-disabled.png b/icons/undo-disabled.png
new file mode 100644
index 000000000..99306ac93
Binary files /dev/null and b/icons/undo-disabled.png differ
diff --git a/icons/undo.png b/icons/undo.png
new file mode 100644
index 000000000..f709c8c24
Binary files /dev/null and b/icons/undo.png differ
diff --git a/panels/project.cpp b/panels/project.cpp
index faf05daf6..2a8bde78a 100644
--- a/panels/project.cpp
+++ b/panels/project.cpp
@@ -83,41 +83,67 @@ Project::Project(QWidget *parent) :
 	toolbar->setSpacing(0);
 	toolbar_widget->setLayout(toolbar);
 
-	QPushButton* toolbar_new = new QPushButton("New");
-	toolbar_new->setIcon(QIcon(":/icons/tri-down.png"));
-	toolbar_new->setIconSize(QSize(8, 8));
+    QPushButton* toolbar_new = new QPushButton(toolbar_widget);
+	QIcon icon1;
+	icon1.addFile(QStringLiteral(":/icons/add-button.png"), QSize(), QIcon::Normal, QIcon::On);
+	icon1.addFile(QStringLiteral(":/icons/add-button-disabled.png"), QSize(), QIcon::Disabled, QIcon::On);
+	toolbar_new->setIcon(icon1);
 	toolbar_new->setToolTip("New");
 	connect(toolbar_new, SIGNAL(clicked(bool)), this, SLOT(make_new_menu()));
 	toolbar->addWidget(toolbar_new);
 
-	QPushButton* toolbar_open = new QPushButton("Open");
+	QPushButton* toolbar_open = new QPushButton(toolbar_widget);
+	QIcon icon2;
+	icon2.addFile(QStringLiteral(":/icons/open.png"), QSize(), QIcon::Normal, QIcon::On);
+	icon2.addFile(QStringLiteral(":/icons/open-disabled.png"), QSize(), QIcon::Disabled, QIcon::On);
+	toolbar_open->setIcon(icon2);
 	toolbar_open->setToolTip("Open Project");
 	connect(toolbar_open, SIGNAL(clicked(bool)), mainWindow, SLOT(open_project()));
 	toolbar->addWidget(toolbar_open);
 
-	QPushButton* toolbar_save = new QPushButton("Save");
+	QPushButton* toolbar_save = new QPushButton(toolbar_widget);
+	QIcon icon3;
+	icon3.addFile(QStringLiteral(":/icons/save.png"), QSize(), QIcon::Normal, QIcon::On);
+	icon3.addFile(QStringLiteral(":/icons/save-disabled.png"), QSize(), QIcon::Disabled, QIcon::On);
+	toolbar_save->setIcon(icon3);
 	toolbar_save->setToolTip("Save Project");
 	connect(toolbar_save, SIGNAL(clicked(bool)), mainWindow, SLOT(save_project()));
 	toolbar->addWidget(toolbar_save);
 
-	QPushButton* toolbar_undo = new QPushButton("Undo");
+	QPushButton* toolbar_undo = new QPushButton(toolbar_widget);
+	QIcon icon4;
+	icon4.addFile(QStringLiteral(":/icons/undo.png"), QSize(), QIcon::Normal, QIcon::On);
+	icon4.addFile(QStringLiteral(":/icons/undo-disabled.png"), QSize(), QIcon::Disabled, QIcon::On);
+	toolbar_undo->setIcon(icon4);
 	toolbar_undo->setToolTip("Undo");
 	connect(toolbar_undo, SIGNAL(clicked(bool)), mainWindow, SLOT(undo()));
 	toolbar->addWidget(toolbar_undo);
 
-	QPushButton* toolbar_redo = new QPushButton("Redo");
+	QPushButton* toolbar_redo = new QPushButton(toolbar_widget);
+	QIcon icon5;
+	icon5.addFile(QStringLiteral(":/icons/redo.png"), QSize(), QIcon::Normal, QIcon::On);
+	icon5.addFile(QStringLiteral(":/icons/redo-disabled.png"), QSize(), QIcon::Disabled, QIcon::On);
+	toolbar_redo->setIcon(icon5);
 	toolbar_redo->setToolTip("Redo");
 	connect(toolbar_redo, SIGNAL(clicked(bool)), mainWindow, SLOT(redo()));
 	toolbar->addWidget(toolbar_redo);
 
 	toolbar->addStretch();
 
-	QPushButton* toolbar_tree_view = new QPushButton("Tree View");
+	QPushButton* toolbar_tree_view = new QPushButton(toolbar_widget);
+	QIcon icon6;
+	icon6.addFile(QStringLiteral(":/icons/treeview.png"), QSize(), QIcon::Normal, QIcon::On);
+	icon6.addFile(QStringLiteral(":/icons/treeview-disabled.png"), QSize(), QIcon::Disabled, QIcon::On);
+	toolbar_tree_view->setIcon(icon6);
 	toolbar_tree_view->setToolTip("Tree View");
 	connect(toolbar_tree_view, SIGNAL(clicked(bool)), this, SLOT(set_tree_view()));
 	toolbar->addWidget(toolbar_tree_view);
 
-	QPushButton* toolbar_icon_view = new QPushButton("Icon View");
+	QPushButton* toolbar_icon_view = new QPushButton(toolbar_widget);
+	QIcon icon7;
+	icon7.addFile(QStringLiteral(":/icons/iconview.png"), QSize(), QIcon::Normal, QIcon::On);
+	icon7.addFile(QStringLiteral(":/icons/iconview-disabled.png"), QSize(), QIcon::Disabled, QIcon::On);
+	toolbar_icon_view->setIcon(icon7);
 	toolbar_icon_view->setToolTip("Icon View");
 	connect(toolbar_icon_view, SIGNAL(clicked(bool)), this, SLOT(set_icon_view()));
 	toolbar->addWidget(toolbar_icon_view);
@@ -401,7 +427,7 @@ Media* Project::new_folder(QString name) {
 
 Media *Project::item_to_media(const QModelIndex &index) {
 	return static_cast<Media*>(sorter->mapToSource(index).internalPointer());
-//    return static_cast<Media*>(index.internalPointer());
+//	return static_cast<Media*>(index.internalPointer());
 }
 
 void Project::get_all_media_from_table(QList<Media*>& items, QList<Media*>& list, int search_type) {
@@ -527,7 +553,7 @@ void Project::delete_selected_media() {
 	// remove
 	if (remove) {
 		panel_effect_controls->clear_effects(true);
-        if (sequence != NULL) sequence->selections.clear();
+		if (sequence != NULL) sequence->selections.clear();
 
 		// remove media and parents
 		for (int m=0;m<parents.size();m++) {