diff --git a/README.md b/README.md
index 281fecd1..d8430bd3 100644
--- a/README.md
+++ b/README.md
@@ -65,9 +65,9 @@ API Documentation
 
 @htmlonly
 
-<a href="http://iotdk.intel.com/docs/master/upm/modules.html"><img src="docs/c++.png"/></a>
-<a href="http://iotdk.intel.com/docs/master/upm/python"><img src="docs/python.png"/></a>
-<a href="http://iotdk.intel.com/docs/master/upm/node"><img src="docs/node.png"/></a>
+<a href="http://iotdk.intel.com/docs/master/upm/modules.html"><img src="docs/icons/c++.png"/></a>
+<a href="http://iotdk.intel.com/docs/master/upm/python"><img src="docs/icons/python.png"/></a>
+<a href="http://iotdk.intel.com/docs/master/upm/node"><img src="docs/icons/node.png"/></a>
 
 @endhtmlonly
 
diff --git a/doxy/index.rst b/doxy/index.rst
index c335fbcc..3f2cd865 100644
--- a/doxy/index.rst
+++ b/doxy/index.rst
@@ -56,11 +56,11 @@ Don't forget to check the documentation `section <https://github.com/intel-iot-d
 ``Other API Documentation``
 ###########################
 
-.. image:: ../docs/c++.png
+.. image:: ../docs/icons/c++.png
    :target: http://iotdk.intel.com/docs/master/upm/modules.html
-.. image:: ../docs/python.png
+.. image:: ../docs/icons/python.png
    :target: http://iotdk.intel.com/docs/master/upm/python
-.. image:: ../docs/node.png
+.. image:: ../docs/icons/node.png
    :target: http://iotdk.intel.com/docs/master/upm/node
 
 ``Version Changelog``
diff --git a/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars b/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
index 99f7189f..4e6d440d 100644
--- a/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
+++ b/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
@@ -109,9 +109,9 @@
                                                title="Permalink to this headline"></a></h1>
       
 
-      <p><a href="http://iotdk.intel.com/docs/master/upm/modules.html"><img src="../docs/c++.png" /></a>
-      <a href="http://iotdk.intel.com/docs/master/upm/python"><img src="../docs/python.png" /></a>
-      <a href="http://iotdk.intel.com/docs/master/upm/node"><img src="../docs/node.png" /></a>
+      <p><a href="http://iotdk.intel.com/docs/master/upm/modules.html"><img src="../docs/icons/c++.png" /></a>
+      <a href="http://iotdk.intel.com/docs/master/upm/python"><img src="../docs/icons/python.png" /></a>
+      <a href="http://iotdk.intel.com/docs/master/upm/node"><img src="../docs/icons/node.png" /></a>
       </p>
     </div>
     <div class="section" id="version-changelog">