diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
index 002a2b82623..211aca4065d 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
@@ -46,7 +46,9 @@ CMakeInputsNode::CMakeInputsNode(const Utils::FilePath &cmakeLists) :
 {
     setPriority(Node::DefaultPriority - 10); // Bottom most!
     setDisplayName(QCoreApplication::translate("CMakeFilesProjectNode", "CMake Modules"));
-    setIcon(QIcon(":/projectexplorer/images/session.png")); // TODO: Use a better icon!
+    static const QIcon modulesIcon = Core::FileIconProvider::directoryIcon(
+                ProjectExplorer::Constants::FILEOVERLAY_MODULES);
+    setIcon(modulesIcon);
     setListInProject(false);
 }
 
diff --git a/src/plugins/projectexplorer/images/fileoverlay_modules.png b/src/plugins/projectexplorer/images/fileoverlay_modules.png
new file mode 100644
index 00000000000..0ebdea29e5c
Binary files /dev/null and b/src/plugins/projectexplorer/images/fileoverlay_modules.png differ
diff --git a/src/plugins/projectexplorer/images/fileoverlay_modules@2x.png b/src/plugins/projectexplorer/images/fileoverlay_modules@2x.png
new file mode 100644
index 00000000000..96c940d5c76
Binary files /dev/null and b/src/plugins/projectexplorer/images/fileoverlay_modules@2x.png differ
diff --git a/src/plugins/projectexplorer/images/session.png b/src/plugins/projectexplorer/images/session.png
deleted file mode 100644
index 6d526f6bee1..00000000000
Binary files a/src/plugins/projectexplorer/images/session.png and /dev/null differ
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index 76a913e8df1..b09c7e26da0 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -24,7 +24,6 @@
         <file>images/debugger_overlay_small@2x.png</file>
         <file>images/analyzer_overlay_small.png</file>
         <file>images/analyzer_overlay_small@2x.png</file>
-        <file>images/session.png</file>
         <file>images/BuildSettings.png</file>
         <file>images/CodeStyleSettings.png</file>
         <file>images/RunSettings.png</file>
@@ -67,6 +66,8 @@
         <file>images/fileoverlay_product@2x.png</file>
         <file>images/fileoverlay_group.png</file>
         <file>images/fileoverlay_group@2x.png</file>
+        <file>images/fileoverlay_modules.png</file>
+        <file>images/fileoverlay_modules@2x.png</file>
         <file>images/fileoverlay_ui.png</file>
         <file>images/fileoverlay_ui@2x.png</file>
         <file>images/fileoverlay_scxml.png</file>
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 5bc3a8da3f0..e0f7fa80459 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -215,6 +215,7 @@ const char PROJECTTREE_ID[] = "Projects";
 const char FILEOVERLAY_QT[]=":/projectexplorer/images/fileoverlay_qt.png";
 const char FILEOVERLAY_GROUP[] = ":/projectexplorer/images/fileoverlay_group.png";
 const char FILEOVERLAY_PRODUCT[] = ":/projectexplorer/images/fileoverlay_product.png";
+const char FILEOVERLAY_MODULES[] = ":/projectexplorer/images/fileoverlay_modules.png";
 const char FILEOVERLAY_QML[]=":/projectexplorer/images/fileoverlay_qml.png";
 const char FILEOVERLAY_UI[]=":/projectexplorer/images/fileoverlay_ui.png";
 const char FILEOVERLAY_QRC[]=":/projectexplorer/images/fileoverlay_qrc.png";
diff --git a/src/tools/iconlister/iconlister.cpp b/src/tools/iconlister/iconlister.cpp
index e8b9d3eb18d..d3d084e8ca5 100644
--- a/src/tools/iconlister/iconlister.cpp
+++ b/src/tools/iconlister/iconlister.cpp
@@ -334,8 +334,6 @@ void IconLister::addProjectExplorerIcons()
 
         {QIcon(":/projectexplorer/images/category_buildrun.png"), "category_buildrun.png", prefix,
          ""},
-        {QIcon(":/projectexplorer/images/session.png"), "session.png", prefix,
-         ""},
         {QIcon(":/projectexplorer/images/BuildSettings.png"), "BuildSettings.png", prefix,
          ""},
         {QIcon(":/projectexplorer/images/CodeStyleSettings.png"), "CodeStyleSettings.png", prefix,
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index e0bec68332c..bc5658d99cd 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -18,6 +18,18 @@
    sodipodi:docname="qtcreatoricons.svg">
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2550">
+      <stop
+         style="stop-color:#459933;stop-opacity:1"
+         offset="0"
+         id="stop2546" />
+      <stop
+         style="stop-color:#79cc66;stop-opacity:1"
+         offset="1"
+         id="stop2548" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3970">
@@ -587,6 +599,15 @@
          values="0.66 0 0 0.35 0.0182292 0.02 0.66 0.02 0.35 0.0182292 0.08 0.08 0.66 0.35 0.02 0 0 0 1 0 "
          id="feColorMatrix2747" />
     </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2550"
+       id="linearGradient2552"
+       x1="74"
+       y1="530.5"
+       x2="75"
+       y2="534"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -9355,6 +9376,50 @@
          cy="531"
          r="1.5" />
     </g>
+    <g
+       id="src/plugins/projectexplorer/images/fileoverlay_modules"
+       transform="translate(176)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#transparentBackgroundRect"
+         id="use2538"
+         width="100%"
+         transform="translate(80,68)"
+         height="100%" />
+      <path
+         style="opacity:0.75;fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
+         d="m 68.5,529.19 7.5,-3.69 3.5,1.7 V 531.8 L 72,535.5 68.5,533.8 Z"
+         id="path4572"
+         sodipodi:nodetypes="ccccccc" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g2810"
+         id="use2833"
+         transform="translate(4,-2)"
+         width="100%"
+         height="100%" />
+      <g
+         id="g2810"
+         transform="translate(-1)">
+        <path
+           style="fill:#97d98c;fill-opacity:1"
+           d="m 70,529.5 3,-1.5 3,1.5 -3,5.5 z"
+           id="path2816"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:url(#linearGradient2552);fill-opacity:1"
+           d="m 76,529.5 v 4 l -3,1.5 -3,-2.5 z"
+           id="path2814"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#2e7326;fill-opacity:1"
+           d="m 70,529.5 v 4 l 3,1.5 v -4 z"
+           id="path2812"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
     <g
        id="src/libs/utils/images/filesave">
       <rect