diff --git a/ConsoleWindow.cpp b/ConsoleWindow.cpp
index bf601a3..095992d 100644
--- a/ConsoleWindow.cpp
+++ b/ConsoleWindow.cpp
@@ -51,6 +51,8 @@ ConsoleWindow::ConsoleWindow(QWidget *parent) : QMainWindow(parent)
 
   // Set window title
   setWindowTitle(tr("Message Log Output - Mapmap"));
+  // Set window icon
+  setWindowIcon(QIcon(":/mapmap-logo"));
   // Set main widget
   setCentralWidget(_console);
 }
diff --git a/MainWindow.cpp b/MainWindow.cpp
index 5966906..71b7e48 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -77,7 +77,7 @@ MainWindow::MainWindow()
   startOscReceiver();
 
   // Defaults.
-  //setWindowIcon(QIcon(":/images/icon.png"));
+  setWindowIcon(QIcon(":/mapmap-logo"));
   setCurrentFile("");
 
   // Create and start timer.
diff --git a/mapmap.qrc b/mapmap.qrc
index 45ffc66..69c949e 100644
--- a/mapmap.qrc
+++ b/mapmap.qrc
@@ -21,7 +21,7 @@
         <file alias="shape-ellipse">resources/images/shapes/add_circle.png</file>
         <file alias="shape-polygon">resources/images/shapes/add_circle.png</file>
         <file alias="mapmap-title">resources/images/logo/logomapmap.png</file>
-        <file alias="mapmap-logo">resources/images/logo/logo_m_big_mapmap.png</file>
+        <file alias="mapmap-logo">resources/images/logo/mapmap-logo.png</file>
         <file alias="mapmap-splash">resources/images/logo/splash.png</file>
         <file alias="logo-title">resources/fonts/DroidSans.otf</file>
         <file alias="base-font">resources/fonts/DroidSans.otf</file>
diff --git a/resources/images/logo/mapmap-logo.png b/resources/images/logo/mapmap-logo.png
new file mode 100644
index 0000000..f35732b
Binary files /dev/null and b/resources/images/logo/mapmap-logo.png differ