diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade
index e3933eb9..6b6b7c52 100644
--- a/app/partials/issues-detail-edit.jade
+++ b/app/partials/issues-detail-edit.jade
@@ -64,9 +64,15 @@ block content
             section.watchers(tg-watchers, ng-model="issue.watchers", editable="true")
 
             section.us-detail-settings
-                a.button.button-gray(href="", title="Client requirement") Client requirement
-                a.button.button-gray(href="", title="Team requirement") Team requirement
-                a.button.button-red(href="", title="Block") Block
+                    fieldset
+                        label.button.button-gray(for="client-requirement") Client requirement
+                        input(type="checkbox", id="client-requirement")
+                    fieldset
+                        label.button.button-gray(for="team-requirement") Team requirement
+                        input(type="checkbox", id="client-requirement")
+                    fieldset
+                        label.button.button-red(for="Block") Block
+                        input(type="checkbox", id="Block")
 
         div.lightbox.lightbox_block.hidden
             include views/modules/lightbox_block
diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade
index c4c08aa0..0249d8e8 100644
--- a/app/partials/issues-detail.jade
+++ b/app/partials/issues-detail.jade
@@ -67,9 +67,9 @@ block content
             section.watchers(tg-watchers, ng-model="issue.watchers")
 
             section.us-detail-settings
-                a.button.button-gray(href="", title="Client requirement") Client requirement
-                a.button.button-gray(href="", title="Team requirement") Team requirement
-                a.button.button-red(href="", title="Block") Block
+                span.button.button-gray Client requirement
+                span.button.button-gray Team requirement
+                span.button.button-red Block
 
         div.lightbox.lightbox_block.hidden
             include views/modules/lightbox_block
diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade
index 611532ed..2c9d8589 100644
--- a/app/partials/us-detail.jade
+++ b/app/partials/us-detail.jade
@@ -75,6 +75,6 @@ block content
                                          img(src="http://thecodeplayer.com/u/uifaces/32.jpg", alt="username")
                                  a.watcher-name(href="", title="Jesús Espino") Jesús Espino
                 section.us-detail-settings
-                    a.button.button-gray(href="", title="Client requirement") Client requirement
-                    a.button.button-gray(href="", title="Team requirement") Team requirement
-                    a.button.button-red(href="", title="Block") Block
+                    span.button.button-gray(href="", title="Client requirement") Client requirement
+                    span.button.button-gray(href="", title="Team requirement") Team requirement
+                    span.button.button-red(href="", title="Block") Block
diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss
index ce0fb77a..c213c3b5 100644
--- a/app/styles/layout/us-detail.scss
+++ b/app/styles/layout/us-detail.scss
@@ -279,4 +279,25 @@
             background: $red;
         }
     }
+    label {
+        &+input {
+            display: none;
+        }
+    }
+    span {
+        &.button-gray,
+        &.button-gray:hover {
+            background: $gray-light;
+            &.active {
+                background: $gray;
+            }
+        }
+        &.button-red,
+        &.button-red:hover {
+            background: $red-light;
+            &.active {
+                background: $red;
+            }
+        }
+    }
 }