diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee
index 3e6e0f0a..4582712a 100644
--- a/app/coffee/modules/common/components.coffee
+++ b/app/coffee/modules/common/components.coffee
@@ -346,28 +346,22 @@ module.directive("tgAssignedTo", ["$rootScope", "$tgConfirm", "$tgRepo", "$tgLoa
 #############################################################################
 
 BlockButtonDirective = ($rootscope, $loading) ->
-    template = _.template("""
+    template = """
       <a class="button button-gray item-block">Block</a>
       <a class="button button-red item-unblock">Unblock</a>
-    """)
+    """
 
     link = ($scope, $el, $attrs, $model) ->
-        render = _.once (item) ->
-            $el.html(template())
+        $scope.$watch $attrs.ngModel, (item) ->
+            return if not item
 
-        refresh = (item) ->
-            if item?.is_blocked
+            if item.is_blocked
                 $el.find('.item-block').hide()
                 $el.find('.item-unblock').show()
             else
                 $el.find('.item-block').show()
                 $el.find('.item-unblock').hide()
 
-        $scope.$watch $attrs.ngModel, (item) ->
-            return if not item
-            render(item)
-            refresh(item)
-
         $el.on "click", ".item-block", (event) ->
             $rootscope.$broadcast("block", $model.$modelValue)
 
@@ -385,6 +379,7 @@ BlockButtonDirective = ($rootscope, $loading) ->
         link: link
         restrict: "EA"
         require: "ngModel"
+        template: template
     }
 
 module.directive("tgBlockButton", ["$rootScope", "$tgLoading", BlockButtonDirective])
diff --git a/app/coffee/modules/tasks/detail.coffee b/app/coffee/modules/tasks/detail.coffee
index 3d119131..1a824f04 100644
--- a/app/coffee/modules/tasks/detail.coffee
+++ b/app/coffee/modules/tasks/detail.coffee
@@ -270,28 +270,22 @@ module.directive("tgTaskStatusButton", ["$rootScope", "$tgRepo", "$tgConfirm", "
 
 
 TaskIsIocaineButtonDirective = ($rootscope, $tgrepo, $confirm, $loading) ->
-    template = _.template("""
+    template = """
       <fieldset title="Feeling a bit overwhelmed by a task? Make sure others know about it by clicking on Iocaine when editing a task. It's possible to become immune to this (fictional) deadly poison by consuming small amounts over time just as it's possible to get better at what you do by occasionally taking on extra challenges!">
         <label for="is-iocaine" class="clickable button button-gray is-iocaine">Iocaine</label>
         <input type="checkbox" id="is-iocaine" name="is-iocaine"/>
       </fieldset>
-    """)
+    """
 
     link = ($scope, $el, $attrs, $model) ->
-        render = _.once (task) ->
-            $el.html(template())
+        $scope.$watch $attrs.ngModel, (task) ->
+            return if not task
 
-        refresh = (task) ->
-            if task?.is_iocaine
+            if task.is_iocaine
                 $el.find('.is-iocaine').addClass('active')
             else
                 $el.find('.is-iocaine').removeClass('active')
 
-        $scope.$watch $attrs.ngModel, (task) ->
-            return if not task
-            render(task)
-            refresh(task)
-
         $scope.$on "$destroy", ->
             $el.off()
 
@@ -316,6 +310,7 @@ TaskIsIocaineButtonDirective = ($rootscope, $tgrepo, $confirm, $loading) ->
         link: link
         restrict: "EA"
         require: "ngModel"
+        template: tempalte
     }
 
 module.directive("tgTaskIsIocaineButton", ["$rootScope", "$tgRepo", "$tgConfirm", "$tgLoading", TaskIsIocaineButtonDirective])
diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade
index 54e39830..3b2dfeb4 100644
--- a/app/partials/issues-detail.jade
+++ b/app/partials/issues-detail.jade
@@ -54,7 +54,7 @@ block content
 
             section.us-detail-settings
                tg-promote-issue-to-us-button(tg-check-permission="add_us", ng-model="issue")
-               div(tg-check-permission="modify_issue", tg-block-button, ng-model="issue")
+               tg-block-button(tg-check-permission="modify_issue", ng-model="issue")
                tg-delete-button(tg-check-permission="delete_issue",
                                 on-delete-go-to-url="project-issues",
                                 project-slug="{{ project.slug }}",
diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade
index 45bb5fdc..c61b8557 100644
--- a/app/partials/task-detail.jade
+++ b/app/partials/task-detail.jade
@@ -53,7 +53,7 @@ block content
 
             section.us-detail-settings
                fieldset(tg-task-is-iocaine-button, tg-check-permission="modify_task", ng-model="task")
-               div(tg-check-permission="modify_task", tg-block-button, ng-model="task")
+               tg-block-button(tg-check-permission="modify_task", ng-model="task")
                tg-delete-button(tg-check-permission="delete_task",
                                 on-delete-go-to-url="project-backlog",
                                 project-slug="{{ project.slug }}",
diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade
index 2e530e76..f458d391 100644
--- a/app/partials/us-detail.jade
+++ b/app/partials/us-detail.jade
@@ -60,7 +60,7 @@ block content
             section.us-detail-settings
                 tg-us-team-requirement-button(ng-model="us")
                 tg-us-client-requirement-button(ng-model="us")
-                div(tg-check-permission="modify_us", tg-block-button, ng-model="us")
+                tg-block-button(tg-check-permission="modify_us", ng-model="us")
                 tg-delete-button(tg-check-permission="delete_us",
                                  on-delete-go-to-url="project-backlog",
                                  project-slug="{{ project.slug }}",