diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee
index 3b6b102c..3969bbb2 100644
--- a/app/coffee/modules/kanban/main.coffee
+++ b/app/coffee/modules/kanban/main.coffee
@@ -286,7 +286,7 @@ module.directive("tgKanbanWipLimit", KanbanWipLimitDirective)
 KanbanUserDirective = ($log) ->
     template = _.template("""
     <figure class="avatar">
-        <a href="#" title="Change assignation" <% if (!clickable) {%>class="not-clickable"<% } %>>
+        <a href="#" title="Assign User Story" <% if (!clickable) {%>class="not-clickable"<% } %>>
             <img src="<%= imgurl %>" alt="<%- name %>" class="avatar">
         </a>
     </figure>
diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee
index 6de00b2f..0a834479 100644
--- a/app/coffee/modules/taskboard/main.coffee
+++ b/app/coffee/modules/taskboard/main.coffee
@@ -244,7 +244,7 @@ module.directive("tgTaskboardRowSizeFixer", TaskboardRowSizeFixer)
 TaskboardUserDirective = ($log) ->
     template = _.template("""
     <figure class="avatar">
-        <a href="#" title="Change assignation" <% if (!clickable) {%>class="not-clickable"<% } %>>
+        <a href="#" title="Assign task" <% if (!clickable) {%>class="not-clickable"<% } %>>
             <img src="<%= imgurl %>" alt="<%- name %>">
         </a>
     </figure>
diff --git a/app/partials/views/components/kanban-task.jade b/app/partials/views/components/kanban-task.jade
index 4d6cc513..cde12737 100644
--- a/app/partials/views/components/kanban-task.jade
+++ b/app/partials/views/components/kanban-task.jade
@@ -2,7 +2,7 @@ div.kanban-tagline(tg-colorize-tags="us.tags" tg-colorize-tags-type="kanban")
 div.kanban-task-inner
     div(tg-kanban-user-avatar="us.assigned_to", ng-model="us")
     div.task-text
-        a.task-assigned(href="", title="Change assignation")
+        a.task-assigned(href="", title="Assign User Story")
         span.task-num(tg-bo-ref="us.ref")
         a.task-name(href="", title="", tg-bind-html="us.subject",
                     tg-nav="project-userstories-detail:project=project.slug,ref=us.ref")
diff --git a/app/partials/views/components/taskboard-task.jade b/app/partials/views/components/taskboard-task.jade
index e46af54b..cca75a14 100644
--- a/app/partials/views/components/taskboard-task.jade
+++ b/app/partials/views/components/taskboard-task.jade
@@ -1,9 +1,11 @@
 div.taskboard-tagline(tg-colorize-tags="task.tags", tg-colorize-tags-type="taskboard")
 div.taskboard-task-inner
-    div.taskboard-user-avatar(tg-taskboard-user-avatar="task.assigned_to", ng-model="task", click="ctrl.editTaskAssignedTo(task)", ng-class="{iocaine: task.is_iocaine}")
-    span.icon.icon-iocaine(ng-show="task.is_iocaine")
+    div.taskboard-user-avatar(tg-taskboard-user-avatar="task.assigned_to", ng-model="task",
+                             click="ctrl.editTaskAssignedTo(task)",
+                             ng-class="{iocaine: task.is_iocaine}")
+    span.icon.icon-iocaine(ng-if="task.is_iocaine")
     p.taskboard-text
-        a.task-assigned(href="", ng-click="ctrl.editTaskAssignedTo(task)", title="Change assignation")
+        a.task-assigned(href="", ng-click="ctrl.editTaskAssignedTo(task)", title="Assign task")
         span.task-num(tg-bo-ref="task.ref")
         a.task-name(href="", title="See task details", tg-bind-html="task.subject",
                     tg-nav="project-tasks-detail:project=project.slug,ref=task.ref")