diff --git a/README.md b/README.md
index c01d86f4..052f9eca 100644
--- a/README.md
+++ b/README.md
@@ -68,9 +68,9 @@ You can also refer to the [Intel® IoT Developer Zone](https://software.intel.co
 
 ### IDE Integration
 
-If you would like to create Eclipse IDE projects using the UPM C++ samples,
-please follow the instructions posted [here](https://software.intel.com/en-us/node/551014).
-This will show you how to import the code and configure your project.
+If you would like to create projects and run the UPM samples using an Intel recommended IDE,
+please refer to the Intel Developer Zone IDE page.
+<a href="https://software.intel.com/iot/software/ide"><img src="../docs/icons/allides.png"/></a>
 
 ### Building UPM
 
diff --git a/docs/icons/allides.png b/docs/icons/allides.png
new file mode 100644
index 00000000..84100fb1
Binary files /dev/null and b/docs/icons/allides.png differ
diff --git a/docs/icons/eclipse.png b/docs/icons/eclipse.png
new file mode 100644
index 00000000..e8fcff75
Binary files /dev/null and b/docs/icons/eclipse.png differ
diff --git a/docs/icons/wyliodrin.png b/docs/icons/wyliodrin.png
new file mode 100644
index 00000000..8112749d
Binary files /dev/null and b/docs/icons/wyliodrin.png differ
diff --git a/docs/icons/xdk.png b/docs/icons/xdk.png
new file mode 100644
index 00000000..0ec3cd77
Binary files /dev/null and b/docs/icons/xdk.png differ
diff --git a/doxy/README.cpp.md b/doxy/README.cpp.md
index 09278b27..11fb15dc 100644
--- a/doxy/README.cpp.md
+++ b/doxy/README.cpp.md
@@ -32,11 +32,14 @@ Supported [sensor list](http://iotdk.intel.com/docs/master/upm/modules.html) fro
 
 You can also refer to the [Intel® IoT Developer Zone](https://software.intel.com/iot/sensors).
 
-### IDE Integration
+### IDE Compatibility
 
 If you would like to create Eclipse IDE projects using the UPM C++ samples,
-please follow the instructions posted [here](https://software.intel.com/en-us/node/551014).
-This will show you how to import the code and configure your project.
+please follow the instructions provided on the Intel Developer Zone IDE page.
+
+@htmlonly
+<a href="https://software.intel.com/iot/software/ide"><img src="../docs/icons/eclipse.png"/></a>
+@endhtmlonly
 
 ### Building UPM
 
diff --git a/doxy/README.java.md b/doxy/README.java.md
index db130e93..f95f60e4 100644
--- a/doxy/README.java.md
+++ b/doxy/README.java.md
@@ -32,11 +32,14 @@ Supported [sensor list](http://iotdk.intel.com/docs/master/upm/java/modules.html
 
 You can also refer to the [Intel® IoT Developer Zone](https://software.intel.com/iot/sensors).
 
-### IDE Integration
+### IDE Compatibility
 
-If you would like to create Eclipse IDE projects using the UPM C++ samples,
-please follow the instructions posted [here](https://software.intel.com/en-us/node/551014).
-This will show you how to import the code and configure your project.
+If you would like to create Eclipse IDE projects using the UPM Java samples,
+please follow the instructions provided on the Intel Developer Zone IDE page.
+
+@htmlonly
+<a href="https://software.intel.com/iot/software/ide"><img src="../docs/icons/eclipse.png"/></a>
+@endhtmlonly
 
 ### Building UPM
 
diff --git a/doxy/index.rst b/doxy/index.rst
index c0c352e6..ed15fe48 100644
--- a/doxy/index.rst
+++ b/doxy/index.rst
@@ -23,6 +23,15 @@ repository.
 
 Individual sensor usage examples for python are available `here <https://github.com/intel-iot-devkit/upm/tree/master/examples/python>`_.
 
+``IDE Compatibility``
+################
+
+While there is no official IDE provided with our Python libraries, we do recommend the web-based IDE Wyliodrin. It can be used with multiple programming
+languages, including Python. More information can be found on the Intel Developer Zone IDE page.
+
+.. image:: ../docs/icons/wyliodrin.png
+   :target: https://software.intel.com/iot/software/ide
+
 ``Making your own UPM Module``
 ##############################
 
diff --git a/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars b/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
index 56597f82..0253b04e 100644
--- a/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
+++ b/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
@@ -36,6 +36,19 @@
          href="https://github.com/intel-iot-devkit/upm/tree/master/examples/javascript">here</a>.</p>
       
     </div>
+    <div class="section" id="ide"> 
+      <h3><tt class="docutils literal"><span class="pre">IDE Compatibility</span> 
+      <span class="pre">UPM</span></tt><a class="headerlink"
+                                          href="#ide"
+                                          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
+      started.
+      <a href="https://software.intel.com/iot/software/ide"><img src="../docs/icons/xdk.png" /></a>
+      </p>
+    </div>
     <div class="section" id="building-upm"> 
       <h3><tt class="docutils literal"><span class="pre">Building</span> 
       <span class="pre">UPM</span></tt><a class="headerlink"