diff --git a/README.md b/README.md
index dda8d25a..8b8900e8 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ as a contributor. Signing-off your commits is mandatory.
 API Documentation
 ==============
 
-<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"><img src="docs/icons/c++.png"/></a>
 <a href="http://iotdk.intel.com/docs/master/upm/java"><img src="docs/icons/java.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>
diff --git a/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars b/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
index 67587cdf..27af533c 100644
--- a/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
+++ b/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
@@ -43,11 +43,10 @@
                                           title="Permalink to this headline">*</a></h3>
       
 
-      <p>Intel XDK IoT Edition is the recommended IDE for Node.js development.
-      Visit the Intel® Developer Zone IDE page for more information on how to get
+      <p>Intel&reg; XDK IoT Edition is the recommended IDE for Node.js development.
+      Visit the Intel&reg; Developer Zone IDE page for more information on how to get
       started.<br>
-      <a href="https://software.intel.com/iot/software/ide">
-      <img src="../docs/icons/xdk.png" style="margin:auto; display:block; float:none;"/></a>
+      <a href="https://software.intel.com/iot/software/ide"><img src="../docs/icons/xdk.png"/></a>
       </p>
     </div>
     <div class="section" id="building-upm">