diff --git a/src/IDF/Views/Download.php b/src/IDF/Views/Download.php
index 972f286..49f8187 100644
--- a/src/IDF/Views/Download.php
+++ b/src/IDF/Views/Download.php
@@ -71,12 +71,10 @@ class IDF_Views_Download
         $pag->no_results_text = __('No downloads were found.');
         $pag->sort_order = array('creation_dtime', 'DESC');
         $pag->setFromRequest($request);
-        $tags = $prj->getTagCloud('downloads');
         return Pluf_Shortcuts_RenderToResponse('idf/downloads/index.html',
                                                array(
                                                      'page_title' => $title,
                                                      'downloads' => $pag,
-                                                     'tags' => $tags,
                                                      'deprecated' => count($ids),
                                                      'dlabel' => $dtag,
                                                      ),
@@ -370,4 +368,4 @@ function IDF_Views_Download_SummaryAndLabels($field, $down, $extra='')
 function IDF_Views_Download_Size($field, $down)
 {
     return Pluf_Utils::prettySize($down->$field);
-}
\ No newline at end of file
+}
diff --git a/src/IDF/Views/Issue.php b/src/IDF/Views/Issue.php
index 2f43f6a..75f569a 100644
--- a/src/IDF/Views/Issue.php
+++ b/src/IDF/Views/Issue.php
@@ -71,8 +71,7 @@ class IDF_Views_Issue
                         'page_title' => $title,
                         'open' => $open,
                         'closed' => $closed,
-                        'issues' => $pag,
-                        'cloud' => 'issues');
+                        'issues' => $pag);
         if ($api) return $params;
         return Pluf_Shortcuts_RenderToResponse('idf/issues/index.html',
                                                $params, $request);
diff --git a/src/IDF/Views/Wiki.php b/src/IDF/Views/Wiki.php
index cd68cb2..c6b17b9 100644
--- a/src/IDF/Views/Wiki.php
+++ b/src/IDF/Views/Wiki.php
@@ -67,12 +67,10 @@ class IDF_Views_Wiki
         $pag->no_results_text = __('No documentation pages were found.');
         $pag->sort_order = array('title', 'ASC');
         $pag->setFromRequest($request);
-        $tags = $prj->getTagCloud('wiki');
         return Pluf_Shortcuts_RenderToResponse('idf/wiki/index.html',
                                                array(
                                                      'page_title' => $title,
                                                      'pages' => $pag,
-                                                     'tags' => $tags,
                                                      'deprecated' => count($ids),
                                                      'dlabel' => $dtag,
                                                      ),
diff --git a/src/IDF/templates/idf/downloads/index.html b/src/IDF/templates/idf/downloads/index.html
index d5805aa..f5b6c4b 100644
--- a/src/IDF/templates/idf/downloads/index.html
+++ b/src/IDF/templates/idf/downloads/index.html
@@ -9,13 +9,8 @@
 {/block}
 {block context}
 <p><strong>{trans 'Number of files:'}</strong> {$downloads.nb_items}</p>
-{assign $class = ''}{assign $i = 0}
-{if !$label or $label.id != $dlabel.id}
-<p class="smaller">{foreach $tags as $lab}
-{aurl 'url', 'IDF_Views_Download::listLabel', array($project.shortname, $lab.id)}
-{if $class != $lab.class}{if $i != 0}<br />{/if}<strong class="label">{$lab.class}:</strong> {/if}
-<a href="{$url}" class="label">{$lab.name}</a>,{assign $i = $i + 1}{assign $class = $lab.class}{/foreach}</p>
-{/if}
+{assign $cloud = 'downloads'}
+{include 'idf/tags-cloud.html'}
 {if $deprecated > 0}
 {aurl 'url', 'IDF_Views_Download::listLabel', array($project.shortname, $dlabel.id)}
 <p class="helptext">{blocktrans}See <a href="{$url}">the deprecated files</a>.{/blocktrans}</p>
diff --git a/src/IDF/templates/idf/issues/index.html b/src/IDF/templates/idf/issues/index.html
index b47d980..ac1e1fb 100644
--- a/src/IDF/templates/idf/issues/index.html
+++ b/src/IDF/templates/idf/issues/index.html
@@ -12,12 +12,6 @@
 {aurl 'closed_url', 'IDF_Views_Issue::listStatus', array($project.shortname, 'closed')}
 {blocktrans}<p><strong>Open issues:</strong> <a href="{$open_url}">{$open}</a></p>
 <p><strong>Closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>{/blocktrans}
-{assign $class = ''}{assign $i = 0}
-<div id="issue-tags" class="smaller"><dl>{foreach $project.getTagCloud($cloud) as $label}
-{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
-{if $class != $label.class}<dt class="label">{$label.class}</dt>{assign $i = 0}{/if}
-<dd><a href="{$url}" class="label">{$label.name},</a></dd>
-{assign $class = $label.class}
-{assign $i = $i + 1}
-{/foreach}</dl></p>
+{assign $cloud = 'issues'}
+{include 'idf/tags-cloud.html'}
 {/block}
diff --git a/src/IDF/templates/idf/tags-cloud.html b/src/IDF/templates/idf/tags-cloud.html
new file mode 100644
index 0000000..cdf375e
--- /dev/null
+++ b/src/IDF/templates/idf/tags-cloud.html
@@ -0,0 +1,8 @@
+{assign $class = ''}{assign $i = 0}
+<div id="tagscloud" class="smaller"><dl>{foreach $project.getTagCloud($cloud) as $label}
+{aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
+{if $class != $label.class}<dt class="label">{$label.class}</dt>{assign $i = 0}{/if}
+<dd><a href="{$url}" class="label">{$label.name},</a></dd>
+{assign $class = $label.class}
+{assign $i = $i + 1}
+{/foreach}</dl></p>
diff --git a/src/IDF/templates/idf/wiki/index.html b/src/IDF/templates/idf/wiki/index.html
index d6dee59..af6cdec 100644
--- a/src/IDF/templates/idf/wiki/index.html
+++ b/src/IDF/templates/idf/wiki/index.html
@@ -9,13 +9,8 @@
 {/block}
 {block context}
 <p><strong>{trans 'Number of pages:'}</strong> {$pages.nb_items}</p>
-{assign $class = ''}{assign $i = 0}
-{if !$label or $label.id != $dlabel.id}
-<p class="smaller">{foreach $tags as $lab}
-{aurl 'url', 'IDF_Views_Wiki::listLabel', array($project.shortname, $lab.id)}
-{if $class != $lab.class}{if $i != 0}<br />{/if}<strong class="label">{$lab.class}:</strong> {/if}
-<a href="{$url}" class="label">{$lab.name}</a>,{assign $i = $i + 1}{assign $class = $lab.class}{/foreach}</p>
-{/if}
+{assign $cloud = 'wiki'}
+{include 'idf/tags-cloud.html'}
 {if $deprecated > 0}
 {aurl 'url', 'IDF_Views_Wiki::listLabel', array($project.shortname, $dlabel.id)}
 <p class="helptext">{blocktrans}See <a href="{$url}">the deprecated pages</a>.{/blocktrans}</p>
diff --git a/www/media/idf/css/style.css b/www/media/idf/css/style.css
index 8ea1d8e..ff0ce44 100644
--- a/www/media/idf/css/style.css
+++ b/www/media/idf/css/style.css
@@ -203,16 +203,16 @@ span.px-header-title a, span.px-header-title a:link, span.px-header-title a:visi
 /**
  * Issue
  */
-#issue-tags dl {
+#tagscloud dl {
     margin: 0;
 }
 
-#issue-tags dt {
+#tagscloud dt {
     margin-top: .5em;
     font-weight: bold;
 }
 
-#issue-tags dd {
+#tagscloud dd {
     margin: 0;
     display: inline;
 }