diff --git a/module/bug/model.php b/module/bug/model.php
index 91fe83521d..120a8bff05 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -3485,16 +3485,17 @@ class bugModel extends model
     public function printAssignedHtml($bug, $users)
     {
         $btnTextClass   = '';
+        $btnClass       = '';
         $assignedToText = !empty($bug->assignedTo) ? zget($users, $bug->assignedTo) : $this->lang->bug->noAssigned;
-        if(empty($bug->assignedTo)) $btnTextClass = 'assigned';
-        if($bug->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current';
-        if(empty($bug->assignedTo) and $bug->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other';
+        if(empty($bug->assignedTo)) $btnClass = $btnTextClass = 'assigned-none';
+        if($bug->assignedTo == $this->app->user->account) $btnClass = $btnTextClass = 'assigned-current';
+        if(!empty($bug->assignedTo) and $bug->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other';
 
-        $btnClass     = $bug->assignedTo == 'closed' ? ' disabled' : '';
+        $btnClass    .= $bug->assignedTo == 'closed' ? ' disabled' : '';
         $btnClass     = "iframe btn btn-icon-left btn-sm {$btnClass}";
 
         $assignToLink = helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true);
-        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span title='" . zget($users, $bug->assignedTo) . "' class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='$btnClass'");
+        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span title='" . zget($users, $bug->assignedTo) . "'>{$assignedToText}</span>", '', "class='$btnClass'");
 
         echo !common::hasPriv('bug', 'assignTo', $bug) ? "<span style='padding-left: 21px' class='{$btnTextClass}'>{$assignedToText}</span>" : $assignToHtml;
     }
diff --git a/module/design/model.php b/module/design/model.php
index 6440779cb6..95fa962721 100644
--- a/module/design/model.php
+++ b/module/design/model.php
@@ -467,20 +467,21 @@ class designModel extends model
     public function printAssignedHtml($design = '', $users = '')
     {
         $btnTextClass   = '';
+        $btnClass       = '';
         $assignedToText = zget($users, $design->assignedTo);
 
         if(empty($design->assignedTo))
         {
-            $btnTextClass   = 'assigned';
+            $btnClass       = $btnTextClass = 'assigned-none';
             $assignedToText = $this->lang->design->noAssigned;
         }
-        if($design->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current';
-        if(empty($design->assignedTo) and $design->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other';
+        if($design->assignedTo == $this->app->user->account) $btnClass = $btnTextClass = 'assigned-current';
+        if(!empty($design->assignedTo) and $design->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other';
 
-        $btnClass     = $design->assignedTo == 'closed' ? ' disabled' : '';
+        $btnClass    .= $design->assignedTo == 'closed' ? ' disabled' : '';
         $btnClass     = "iframe btn btn-icon-left btn-sm {$btnClass}";
         $assignToLink = helper::createLink('design', 'assignTo', "designID=$design->id", '', true);
-        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span title='" . zget($users, $design->assignedTo) . "' class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='$btnClass'");
+        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span title='" . zget($users, $design->assignedTo) . "'>{$assignedToText}</span>", '', "class='$btnClass'");
 
         echo !common::hasPriv('design', 'assignTo', $design) ? "<span style='padding-left: 21px' class='{$btnTextClass}'>{$assignedToText}</span>" : $assignToHtml;
     }
diff --git a/module/story/model.php b/module/story/model.php
index 3efc178609..829f6bede9 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4907,23 +4907,24 @@ class storyModel extends model
     public function printAssignedHtml($story, $users)
     {
         $btnTextClass   = '';
+        $btnClass       = '';
         $assignedToText = zget($users, $story->assignedTo);
 
         if(empty($story->assignedTo))
         {
-            $btnTextClass   = 'assigned';
+            $btnClass       = $btnTextClass = 'assigned-none';
             $assignedToText = $this->lang->task->noAssigned;
         }
 
-        if($story->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current';
-        if(!empty($story->assignedTo) and $story->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other';
+        if($story->assignedTo == $this->app->user->account) $btnClass = $btnTextClass = 'assigned-current';
+        if(!empty($story->assignedTo) and $story->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other';
 
-        $btnClass     = $story->assignedTo == 'closed' ? ' disabled' : '';
+        $btnClass    .= $story->assignedTo == 'closed' ? ' disabled' : '';
         $btnClass     = "iframe btn btn-icon-left btn-sm {$btnClass}";
         $assignToLink = helper::createLink('story', 'assignTo', "storyID=$story->id&kanbanGroup=default&from=&storyType=$story->type", '', true);
-        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='$btnClass'");
+        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span>{$assignedToText}</span>", '', "class='$btnClass'");
 
-        echo !common::hasPriv($story->type, 'assignTo', $story) ? "<span style='padding-left: 21px'>{$assignedToText}</span>" : $assignToHtml;
+        echo !common::hasPriv($story->type, 'assignTo', $story) ? "<span style='padding-left: 21px' class='$btnTextClass'>{$assignedToText}</span>" : $assignToHtml;
     }
 
     /**
diff --git a/module/task/model.php b/module/task/model.php
index 4d0cee263e..fb543e1236 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3846,6 +3846,7 @@ class taskModel extends model
     public function printAssignedHtml($task, $users)
     {
         $btnTextClass   = '';
+        $btnClass       = '';
         $assignedToText = $assignedToTitle = zget($users, $task->assignedTo);
         if(!empty($task->team) and $task->mode == 'multi' and $task->status != 'closed')
         {
@@ -3867,16 +3868,16 @@ class taskModel extends model
         }
         elseif(empty($task->assignedTo))
         {
-            $btnTextClass   = 'assigned';
+            $btnClass       = $btnTextClass = 'assigned-none';
             $assignedToText = $this->lang->task->noAssigned;
         }
-        if($task->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current';
-        if(empty($task->assignedTo) and $task->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other';
+        if($task->assignedTo == $this->app->user->account) $btnClass = $btnTextClass = 'assigned-current';
+        if(!empty($task->assignedTo) and $task->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other';
 
-        $btnClass     = $task->assignedTo == 'closed' ? ' disabled' : '';
+        $btnClass    .= $task->assignedTo == 'closed' ? ' disabled' : '';
         $btnClass     = "iframe btn btn-icon-left btn-sm {$btnClass}";
         $assignToLink = $task->assignedTo == 'closed' ? '#' : helper::createLink('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", '', true);
-        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span title='" . $assignedToTitle . "' class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='$btnClass'");
+        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span title='" . $assignedToTitle . "'>{$assignedToText}</span>", '', "class='$btnClass'");
 
         echo !common::hasPriv('task', 'assignTo', $task) ? "<span style='padding-left: 21px' class='{$btnTextClass}'>{$assignedToText}</span>" : $assignToHtml;
     }