diff --git a/MainWindow.cpp b/MainWindow.cpp
index aed01bb..26428c1 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -1034,7 +1034,7 @@ void MainWindow::createActions()
   // Play.
   playAction = new QAction(tr("Play"), this);
   playAction->setShortcut(tr("CTRL+P"));
-  playAction->setIcon(QIcon(":/images/draw-ellipse-2.png"));
+  playAction->setIcon(QIcon(":/play"));
   playAction->setStatusTip(tr("Play"));
   connect(playAction, SIGNAL(triggered()), this, SLOT(play()));
   playAction->setEnabled(!_isPlaying);
@@ -1042,7 +1042,7 @@ void MainWindow::createActions()
   // Pause.
   pauseAction = new QAction(tr("Pause"), this);
   pauseAction->setShortcut(tr("CTRL+P"));
-  pauseAction->setIcon(QIcon(":/images/draw-ellipse-2.png"));
+  pauseAction->setIcon(QIcon(":/pause"));
   pauseAction->setStatusTip(tr("Pause"));
   connect(pauseAction, SIGNAL(triggered()), this, SLOT(pause()));
   pauseAction->setEnabled(_isPlaying);
@@ -1050,14 +1050,14 @@ void MainWindow::createActions()
   // Pause.
   rewindAction = new QAction(tr("Rewind"), this);
   rewindAction->setShortcut(tr("CTRL+R"));
-  rewindAction->setIcon(QIcon(":/images/draw-ellipse-2.png"));
+  rewindAction->setIcon(QIcon(":/rewind"));
   rewindAction->setStatusTip(tr("Rewind"));
   connect(rewindAction, SIGNAL(triggered()), this, SLOT(rewind()));
 
   // Toggle display of output window.
   displayOutputWindow = new QAction(tr("&Display output window"), this);
   displayOutputWindow->setShortcut(tr("Ctrl+D"));
-  displayOutputWindow->setIcon(QIcon(":/images/draw-ellipse-2.png"));
+  displayOutputWindow->setIcon(QIcon(":/output-window"));
   displayOutputWindow->setStatusTip(tr("Display output window"));
   displayOutputWindow->setCheckable(true);
   displayOutputWindow->setChecked(true);
@@ -1070,7 +1070,6 @@ void MainWindow::createActions()
   outputWindowFullScreen = new QAction(tr("&Full screen"), this);
   outputWindowFullScreen->setIcon(QIcon(":/fullscreen"));
   outputWindowFullScreen->setShortcut(tr("Ctrl+F"));
-  outputWindowFullScreen->setIcon(QIcon(":/images/draw-ellipse-2.png"));
   outputWindowFullScreen->setStatusTip(tr("Full screen"));
   outputWindowFullScreen->setCheckable(true);
   outputWindowFullScreen->setChecked(false);
@@ -1081,11 +1080,10 @@ void MainWindow::createActions()
   // Output window should be displayed for full screen option to be available.
   connect(displayOutputWindow, SIGNAL(toggled(bool)), outputWindowFullScreen, SLOT(setEnabled(bool)));
 
-
   // Toggle display of canvas controls.
   displayCanvasControls = new QAction(tr("&Display canvas controls"), this);
   //  displayCanvasControls->setShortcut(tr("Ctrl+E"));
-  displayCanvasControls->setIcon(QIcon(":/images/draw-ellipse-2.png"));
+  displayCanvasControls->setIcon(QIcon(":/control-points"));
   displayCanvasControls->setStatusTip(tr("Display canvas controls"));
   displayCanvasControls->setCheckable(true);
   displayCanvasControls->setChecked(true);
diff --git a/mapmap.qrc b/mapmap.qrc
index 2167fbc..4522db7 100644
--- a/mapmap.qrc
+++ b/mapmap.qrc
@@ -1,18 +1,30 @@
 <RCC>
 <qresource>
-    <file alias="new">resources/images/menu/save.png</file>
-    <file alias="open">resources/images/menu/save.png</file>
-    <file alias="save">resources/images/menu/save.png</file>
-    <file alias="save-as">resources/images/menu/save.png</file>
+    <file alias="new">resources/images/icons/newdoc_w.png</file>
+    <file alias="open">resources/images/icons/open_w.png</file>
+    <file alias="save">resources/images/icons/save_w.png</file>
+    <file alias="save-as">resources/images/icons/save_w.png</file>
 
-    <file alias="fullscreen">resources/images/menu/fullscreen.png</file>
+    <file alias="fullscreen">resources/images/icons/fullscreen_w.png</file>
+    <file alias="output-window">resources/images/icons/nofullscreen_w.png</file>
+    <file alias="control-points">resources/images/icons/ctrl_w.png</file>
 
-    <file alias="add-media">resources/images/media/video.png</file>
-    <file alias="add-color">resources/images/menu/add_color.png</file>
+    <file alias="add-media">resources/images/icons/add_movie_w.png</file>
+    <file alias="add-color">resources/images/icons/color_w.png</file>
 
+    <file alias="add-mesh">resources/images/icons/ad_quad_w.png</file>
+    <file alias="add-triangle">resources/images/icons/ad_tri_w.png</file>
+    <file alias="add-ellipse">resources/images/icons/ad_cerl_w.png</file>
+
+<!--
     <file alias="add-mesh">resources/images/shapes/add_quad.png</file>
     <file alias="add-triangle">resources/images/shapes/add_triangle.png</file>
     <file alias="add-ellipse">resources/images/shapes/add_circle.png</file>
+-->
+
+    <file alias="play">resources/images/icons/play_w.png</file>
+    <file alias="pause">resources/images/icons/pause_w.png</file>
+    <file alias="rewind">resources/images/icons/rewind_w.png</file>
 
     <file alias="shape-mesh">resources/images/shapes/add_quad.png</file>
     <file alias="shape-triangle">resources/images/shapes/add_triangle.png</file>
diff --git a/resources/images/icons/ad_cer.png b/resources/images/icons/ad_cer.png
new file mode 100644
index 0000000..92025b9
Binary files /dev/null and b/resources/images/icons/ad_cer.png differ
diff --git a/resources/images/icons/ad_cerl_2.png b/resources/images/icons/ad_cerl_2.png
new file mode 100644
index 0000000..d1b5fc8
Binary files /dev/null and b/resources/images/icons/ad_cerl_2.png differ
diff --git a/resources/images/icons/ad_cerl_w.png b/resources/images/icons/ad_cerl_w.png
new file mode 100644
index 0000000..8cca0f5
Binary files /dev/null and b/resources/images/icons/ad_cerl_w.png differ
diff --git a/resources/images/icons/ad_quad.png b/resources/images/icons/ad_quad.png
new file mode 100644
index 0000000..1ad6633
Binary files /dev/null and b/resources/images/icons/ad_quad.png differ
diff --git a/resources/images/icons/ad_quad_2.png b/resources/images/icons/ad_quad_2.png
new file mode 100644
index 0000000..47bca58
Binary files /dev/null and b/resources/images/icons/ad_quad_2.png differ
diff --git a/resources/images/icons/ad_quad_w.png b/resources/images/icons/ad_quad_w.png
new file mode 100644
index 0000000..67f8c4f
Binary files /dev/null and b/resources/images/icons/ad_quad_w.png differ
diff --git a/resources/images/icons/ad_tri_.png b/resources/images/icons/ad_tri_.png
new file mode 100644
index 0000000..e69de29
diff --git a/resources/images/icons/ad_tri_2.png b/resources/images/icons/ad_tri_2.png
new file mode 100644
index 0000000..7027e8a
Binary files /dev/null and b/resources/images/icons/ad_tri_2.png differ
diff --git a/resources/images/icons/ad_tri_w.png b/resources/images/icons/ad_tri_w.png
new file mode 100644
index 0000000..b1b6f42
Binary files /dev/null and b/resources/images/icons/ad_tri_w.png differ
diff --git a/resources/images/icons/add_color.png b/resources/images/icons/add_color.png
new file mode 100644
index 0000000..045713d
Binary files /dev/null and b/resources/images/icons/add_color.png differ
diff --git a/resources/images/icons/add_color_w.png b/resources/images/icons/add_color_w.png
new file mode 100644
index 0000000..7d6fc6a
Binary files /dev/null and b/resources/images/icons/add_color_w.png differ
diff --git a/resources/images/icons/add_img.png b/resources/images/icons/add_img.png
new file mode 100644
index 0000000..5ab52a5
Binary files /dev/null and b/resources/images/icons/add_img.png differ
diff --git a/resources/images/icons/add_img_w.png b/resources/images/icons/add_img_w.png
new file mode 100644
index 0000000..ab462f1
Binary files /dev/null and b/resources/images/icons/add_img_w.png differ
diff --git a/resources/images/icons/add_movie.png b/resources/images/icons/add_movie.png
new file mode 100644
index 0000000..316487b
Binary files /dev/null and b/resources/images/icons/add_movie.png differ
diff --git a/resources/images/icons/add_movie_w.png b/resources/images/icons/add_movie_w.png
new file mode 100644
index 0000000..3ab60ba
Binary files /dev/null and b/resources/images/icons/add_movie_w.png differ
diff --git a/resources/images/icons/color.png b/resources/images/icons/color.png
new file mode 100644
index 0000000..dab3829
Binary files /dev/null and b/resources/images/icons/color.png differ
diff --git a/resources/images/icons/color2.png b/resources/images/icons/color2.png
new file mode 100644
index 0000000..7b9a4af
Binary files /dev/null and b/resources/images/icons/color2.png differ
diff --git a/resources/images/icons/color2_w.png b/resources/images/icons/color2_w.png
new file mode 100644
index 0000000..b2ee1b8
Binary files /dev/null and b/resources/images/icons/color2_w.png differ
diff --git a/resources/images/icons/color3.png b/resources/images/icons/color3.png
new file mode 100644
index 0000000..66127b1
Binary files /dev/null and b/resources/images/icons/color3.png differ
diff --git a/resources/images/icons/color3_W.png b/resources/images/icons/color3_W.png
new file mode 100644
index 0000000..9bd0010
Binary files /dev/null and b/resources/images/icons/color3_W.png differ
diff --git a/resources/images/icons/color_p.png b/resources/images/icons/color_p.png
new file mode 100644
index 0000000..0bc2311
Binary files /dev/null and b/resources/images/icons/color_p.png differ
diff --git a/resources/images/icons/color_w.png b/resources/images/icons/color_w.png
new file mode 100644
index 0000000..9418ddd
Binary files /dev/null and b/resources/images/icons/color_w.png differ
diff --git a/resources/images/icons/ctrl.png b/resources/images/icons/ctrl.png
new file mode 100644
index 0000000..48a80d8
Binary files /dev/null and b/resources/images/icons/ctrl.png differ
diff --git a/resources/images/icons/ctrl2.png b/resources/images/icons/ctrl2.png
new file mode 100644
index 0000000..390bbe6
Binary files /dev/null and b/resources/images/icons/ctrl2.png differ
diff --git a/resources/images/icons/ctrl2_w.png b/resources/images/icons/ctrl2_w.png
new file mode 100644
index 0000000..f1bd7c9
Binary files /dev/null and b/resources/images/icons/ctrl2_w.png differ
diff --git a/resources/images/icons/ctrl3_w.png b/resources/images/icons/ctrl3_w.png
new file mode 100644
index 0000000..806d6ee
Binary files /dev/null and b/resources/images/icons/ctrl3_w.png differ
diff --git a/resources/images/icons/ctrl_w.png b/resources/images/icons/ctrl_w.png
new file mode 100644
index 0000000..c1b7f4a
Binary files /dev/null and b/resources/images/icons/ctrl_w.png differ
diff --git a/resources/images/icons/fullscreen.png b/resources/images/icons/fullscreen.png
new file mode 100644
index 0000000..3953b11
Binary files /dev/null and b/resources/images/icons/fullscreen.png differ
diff --git a/resources/images/icons/fullscreen2.png b/resources/images/icons/fullscreen2.png
new file mode 100644
index 0000000..b8ee1e2
Binary files /dev/null and b/resources/images/icons/fullscreen2.png differ
diff --git a/resources/images/icons/fullscreen3_w.png b/resources/images/icons/fullscreen3_w.png
new file mode 100644
index 0000000..d7d2833
Binary files /dev/null and b/resources/images/icons/fullscreen3_w.png differ
diff --git a/resources/images/icons/fullscreen_w.png b/resources/images/icons/fullscreen_w.png
new file mode 100644
index 0000000..7f39b05
Binary files /dev/null and b/resources/images/icons/fullscreen_w.png differ
diff --git a/resources/images/icons/grill_W.png b/resources/images/icons/grill_W.png
new file mode 100644
index 0000000..2823368
Binary files /dev/null and b/resources/images/icons/grill_W.png differ
diff --git a/resources/images/icons/grille.png b/resources/images/icons/grille.png
new file mode 100644
index 0000000..5bc7e32
Binary files /dev/null and b/resources/images/icons/grille.png differ
diff --git a/resources/images/icons/newdoc.png b/resources/images/icons/newdoc.png
new file mode 100644
index 0000000..cb90a3e
Binary files /dev/null and b/resources/images/icons/newdoc.png differ
diff --git a/resources/images/icons/newdoc_w.png b/resources/images/icons/newdoc_w.png
new file mode 100644
index 0000000..7f1325f
Binary files /dev/null and b/resources/images/icons/newdoc_w.png differ
diff --git a/resources/images/icons/nofullscreen.png b/resources/images/icons/nofullscreen.png
new file mode 100644
index 0000000..3a1d642
Binary files /dev/null and b/resources/images/icons/nofullscreen.png differ
diff --git a/resources/images/icons/nofullscreen_w.png b/resources/images/icons/nofullscreen_w.png
new file mode 100644
index 0000000..36d8f46
Binary files /dev/null and b/resources/images/icons/nofullscreen_w.png differ
diff --git a/resources/images/icons/open.png b/resources/images/icons/open.png
new file mode 100644
index 0000000..3bbae78
Binary files /dev/null and b/resources/images/icons/open.png differ
diff --git a/resources/images/icons/open_w.png b/resources/images/icons/open_w.png
new file mode 100644
index 0000000..9bf7c8a
Binary files /dev/null and b/resources/images/icons/open_w.png differ
diff --git a/resources/images/icons/pause.png b/resources/images/icons/pause.png
new file mode 100644
index 0000000..1a75e74
Binary files /dev/null and b/resources/images/icons/pause.png differ
diff --git a/resources/images/icons/pause_w.png b/resources/images/icons/pause_w.png
new file mode 100644
index 0000000..591fb62
Binary files /dev/null and b/resources/images/icons/pause_w.png differ
diff --git a/resources/images/icons/pause_w2.png b/resources/images/icons/pause_w2.png
new file mode 100644
index 0000000..784ad03
Binary files /dev/null and b/resources/images/icons/pause_w2.png differ
diff --git a/resources/images/icons/play.png b/resources/images/icons/play.png
new file mode 100644
index 0000000..607c41f
Binary files /dev/null and b/resources/images/icons/play.png differ
diff --git a/resources/images/icons/play_w.png b/resources/images/icons/play_w.png
new file mode 100644
index 0000000..21a274d
Binary files /dev/null and b/resources/images/icons/play_w.png differ
diff --git a/resources/images/icons/rewind.png b/resources/images/icons/rewind.png
new file mode 100644
index 0000000..b1a1a3b
Binary files /dev/null and b/resources/images/icons/rewind.png differ
diff --git a/resources/images/icons/rewind_w.png b/resources/images/icons/rewind_w.png
new file mode 100644
index 0000000..8df4bba
Binary files /dev/null and b/resources/images/icons/rewind_w.png differ
diff --git a/resources/images/icons/save.png b/resources/images/icons/save.png
new file mode 100644
index 0000000..2947ecb
Binary files /dev/null and b/resources/images/icons/save.png differ
diff --git a/resources/images/icons/save_w.png b/resources/images/icons/save_w.png
new file mode 100644
index 0000000..412261e
Binary files /dev/null and b/resources/images/icons/save_w.png differ