diff --git a/ckanext/ubdc/public/base/images/icons/education.png b/ckanext/ubdc/public/base/images/icons/education.png
index d8abbe5..f612ff5 100644
Binary files a/ckanext/ubdc/public/base/images/icons/education.png and b/ckanext/ubdc/public/base/images/icons/education.png differ
diff --git a/ckanext/ubdc/public/base/images/icons/employment-data.png b/ckanext/ubdc/public/base/images/icons/employment-data.png
new file mode 100644
index 0000000..12ffece
Binary files /dev/null and b/ckanext/ubdc/public/base/images/icons/employment-data.png differ
diff --git a/ckanext/ubdc/public/base/images/icons/housing-data.png b/ckanext/ubdc/public/base/images/icons/housing-data.png
new file mode 100644
index 0000000..423c692
Binary files /dev/null and b/ckanext/ubdc/public/base/images/icons/housing-data.png differ
diff --git a/ckanext/ubdc/public/base/images/icons/transport-and-mobility.png b/ckanext/ubdc/public/base/images/icons/transport-and-mobility.png
new file mode 100644
index 0000000..6f55a66
Binary files /dev/null and b/ckanext/ubdc/public/base/images/icons/transport-and-mobility.png differ
diff --git a/ckanext/ubdc/public/base/images/icons/urban-governance.png b/ckanext/ubdc/public/base/images/icons/urban-governance.png
new file mode 100644
index 0000000..758acab
Binary files /dev/null and b/ckanext/ubdc/public/base/images/icons/urban-governance.png differ
diff --git a/ckanext/ubdc/public/base/images/icons/urban-sustainability.png b/ckanext/ubdc/public/base/images/icons/urban-sustainability.png
new file mode 100644
index 0000000..beeda9b
Binary files /dev/null and b/ckanext/ubdc/public/base/images/icons/urban-sustainability.png differ
diff --git a/ckanext/ubdc/templates/home/snippets/themes.html b/ckanext/ubdc/templates/home/snippets/themes.html
index ee6f054..d15d7ec 100644
--- a/ckanext/ubdc/templates/home/snippets/themes.html
+++ b/ckanext/ubdc/templates/home/snippets/themes.html
@@ -16,19 +16,7 @@ <h1>Research Themes</h1>
                         <div class="panel-body">
                           <div class="media">
                             <div class="media-left">
-                              {% if loop.index == 1 %}
-                              <img src="/base/images/icons/bus.png" alt="Bus" />
-                              {% elif loop.index == 2 %}
-                              <img src="/base/images/icons/home.png" alt="Home" />
-                              {% elif loop.index == 3 %}
-                              <img src="/base/images/icons/bag.png" alt="Bag" />
-                              {% elif loop.index == 4 %}
-                              <img src="/base/images/icons/leaf.png" alt="Leaf" />
-                              {% elif loop.index == 5 %}
-                              <img src="/base/images/icons/leaf.png" alt="Leaf" />
-                              {% elif loop.index == 6 %}
-                              <img src="/base/images/icons/leaf.png" alt="Leaf" />
-                              {% endif %}
+                                <img src="/base/images/icons/{{ theme.name }}.png" alt="{{theme.name}}" />
                             </div>
                             <div class="media-body">
                               <h4 class="media-heading">