diff --git a/app/modules/components/belong-to-epics/belong-to-epics.jade b/app/modules/components/belong-to-epics/belong-to-epics.jade
index d492581e..0bcdb61a 100644
--- a/app/modules/components/belong-to-epics/belong-to-epics.jade
+++ b/app/modules/components/belong-to-epics/belong-to-epics.jade
@@ -1,4 +1,6 @@
 - var hash = "#";
 .belong-to-epic-pill-wrapper(tg-repeat="epic in epics")
-    .belong-to-epic-pill(ng-style="{'background': epic.get('color')}")
-    .belong-to-epic-pill-data #{hash}{{epic.get('id')}} {{epic.get('subject')}}
+    .belong-to-epic-pill(
+        ng-style="{'background': epic.get('color')}"
+        title="#{hash}{{epic.get('id')}} {{epic.get('subject')}}"
+    )
diff --git a/app/modules/components/belong-to-epics/belong-to-epics.scss b/app/modules/components/belong-to-epics/belong-to-epics.scss
index 65ad4f2c..e2cbde9c 100644
--- a/app/modules/components/belong-to-epics/belong-to-epics.scss
+++ b/app/modules/components/belong-to-epics/belong-to-epics.scss
@@ -11,20 +11,7 @@
     background-color: $grayer;
     border-radius: 50%;
     display: inline-block;
-    height: .75rem;
-    margin-left: .25rem;
+    height: .7rem;
     position: relative;
-    width: .75rem;
-}
-.belong-to-epic-pill-data {
-    animation: dropdownFade .2s;
-    background: rgba($black, .9);
-    bottom: 1.25rem;
-    color: $white;
-    display: none;
-    left: -100px;
-    padding: .5rem 1rem;
-    position: absolute;
-    width: 200px;
-    z-index: 99;
+    width: .7rem;
 }
diff --git a/app/modules/components/card/card-templates/card-title.jade b/app/modules/components/card/card-templates/card-title.jade
index ad5434d8..76783ecf 100644
--- a/app/modules/components/card/card-templates/card-title.jade
+++ b/app/modules/components/card/card-templates/card-title.jade
@@ -7,3 +7,7 @@ h2.card-title
     )
         span(ng-if="vm.visible('ref')") {{::"#" + vm.item.getIn(['model', 'ref'])}}
         span.e2e-title(ng-if="vm.visible('subject')") {{vm.item.getIn(['model', 'subject'])}}
+        tg-belong-to-epics(
+            ng-if="vm.item.getIn(['model', 'epics'])"
+            epics="vm.item.getIn(['model', 'epics'])"
+        )
diff --git a/app/partials/includes/modules/taskboard-table.jade b/app/partials/includes/modules/taskboard-table.jade
index 3ad5325b..91950ac1 100644
--- a/app/partials/includes/modules/taskboard-table.jade
+++ b/app/partials/includes/modules/taskboard-table.jade
@@ -54,6 +54,10 @@ div.taskboard-table(
                           tg-bo-title="'#' + us.ref + ' ' + us.subject")
                             span.us-ref(tg-bo-ref="us.ref")
                             span(ng-bind="us.subject")
+                            tg-belong-to-epics(
+                                ng-if="us.epics"
+                                epics="us.epics"
+                            )
                     p.points-value
                         span(ng-bind="us.total_points")
                         span(translate="TASKBOARD.TABLE.FIELD_POINTS")