diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index 213bba9..1e414a2 100644
--- a/src/app/topic/indicators.component.html
+++ b/src/app/topic/indicators.component.html
@@ -81,13 +81,7 @@
                 <h3 *ngIf="numberResults.get(i + '-' + j)" class="uk-margin-medium-top uk-text-center uk-text-bold">
                   <span>{{numberResults.get(i + '-' + j) | number}}</span>
                 </h3>
-                <div *ngIf="indicator.description" class="uk-width-1-1 uk-text-muted uk-text-small uk-margin-small-top">
-                  {{indicator.description}}
-                </div>
-                <div *ngIf="indicator.additionalDescription"
-                     class="uk-width-1-1 uk-text-muted uk-text-small uk-margin-small-top">
-                  {{indicator.additionalDescription}}
-                </div>
+                <ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>
               </div>
             </div>
           </div>
@@ -196,13 +190,7 @@
                 <div *ngIf="indicator.indicatorPaths[0] && indicator.indicatorPaths[0].source === 'image'">
                   <img class="uk-width-1-1 uk-height-medium" [src]="indicator.indicatorPaths[0].url">
                 </div>
-                <div *ngIf="indicator.description" class="uk-width-1-1 uk-text-muted uk-text-small uk-margin-small-top">
-                  {{indicator.description}}
-                </div>
-                <div *ngIf="indicator.additionalDescription"
-                     class="uk-width-1-1 uk-text-muted uk-text-small uk-margin-small-top">
-                  {{indicator.additionalDescription}}
-                </div>
+                <ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>
               </div>
             </div>
           </div>
@@ -515,3 +503,16 @@
     </div>
   </div>
 </ng-template>
+
+
+<ng-template #description let-indicator="indicator">
+<span class="descriptionIcon"
+      *ngIf="(indicator.description && indicator.description.length > 0)
+                       || (indicator.additionalDescription && indicator.additionalDescription.length > 0)"
+      uk-icon="info"
+      [attr.uk-tooltip]="'title:<div class=\'uk-padding-small\'>'+
+  (indicator.description&& indicator.description.length > 0?indicator.description:'') +'<br>'+
+(indicator.additionalDescription && indicator.additionalDescription.length?indicator.additionalDescription:'')
+  +'</div>'">
+  </span>
+</ng-template>