diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index dc76d6e945..6d526e2882 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -22,13 +22,13 @@
     if(!$bug->deleted)
     {
         ob_start();
-        if($this->bug->isClickable($bug, 'confirmBug')) common::printIcon('bug', 'confirmBug', $params);
-        common::printIcon('bug', 'assignTo', $params);
-        if($this->bug->isClickable($bug, 'resolve'))  common::printIcon('bug', 'resolve', $params);
-        if($this->bug->isClickable($bug, 'close'))    common::printIcon('bug', 'close', $params);
-        if($this->bug->isClickable($bug, 'activate')) common::printIcon('bug', 'activate', $params);
+        common::printIcon('bug', 'confirmBug', $params, $bug);
+        common::printIcon('bug', 'assignTo',   $params);
+        common::printIcon('bug', 'resolve',    $params, $bug);
+        common::printIcon('bug', 'close',      $params, $bug);
+        common::printIcon('bug', 'activate',   $params, $bug);
 
-        if($this->bug->isClickable($bug, 'toStory')) common::printIcon('bug', 'toStory', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", '', 'button', 'toStory');
+        common::printIcon('bug', 'toStory', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', 'toStory');
         common::printIcon('bug', 'createCase', $convertParams, '', 'button', 'createCase');
 
         common::printDivider();
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 59be53f166..965239e9b5 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -124,7 +124,7 @@ var browseType  = '<?php echo $browseType;?>';
               common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list');
               common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list');
               common::printIcon('task', 'close',  "taskID=$task->id", $task, 'list');
-              if($this->task->isClickable($task, 'edit'))   common::printIcon('task', 'edit',"taskID=$task->id", '', 'list');
+              common::printIcon('task', 'edit',"taskID=$task->id", '', 'list');
               ?>
             </td>
           </tr>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 0e6f13a46d..b4c07b6dff 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -20,11 +20,11 @@
     if(!$project->deleted)
     {
         ob_start();
-        if($this->project->isClickable($project, 'start'))    common::printIcon('project', 'start',    "projectID=$project->id");
-        if($this->project->isClickable($project, 'activate')) common::printIcon('project', 'activate', "projectID=$project->id");
-        if($this->project->isClickable($project, 'delay'))    common::printIcon('project', 'delay',    "projectID=$project->id");
-        if($this->project->isClickable($project, 'suspend'))  common::printIcon('project', 'suspend',  "projectID=$project->id");
-        if($this->project->isClickable($project, 'close'))    common::printIcon('project', 'close',    "projectID=$project->id");
+        common::printIcon('project', 'start',    "projectID=$project->id", $project);
+        common::printIcon('project', 'activate', "projectID=$project->id", $project);
+        common::printIcon('project', 'delay',    "projectID=$project->id", $project);
+        common::printIcon('project', 'suspend',  "projectID=$project->id", $project);
+        common::printIcon('project', 'close',    "projectID=$project->id", $project);
 
         common::printDivider();
         common::printIcon('project', 'edit', $params);
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 950ea81fc0..6c0b7751be 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -21,10 +21,10 @@
   {
       ob_start();
 
-      if($this->story->isClickable($story, 'change')) common::printIcon('story', 'change', "storyID=$story->id");
-      if($this->story->isClickable($story, 'review')) common::printIcon('story', 'review', "storyID=$story->id");
-      if($this->story->isClickable($story, 'close'))  common::printIcon('story', 'close',  "storyID=$story->id");
-      if($this->story->isClickable($story, 'activate'))  common::printIcon('story', 'activate',  "storyID=$story->id");
+      common::printIcon('story', 'change', "storyID=$story->id", $story);
+      common::printIcon('story', 'review', "storyID=$story->id", $story);
+      common::printIcon('story', 'close',  "storyID=$story->id", $story);
+      common::printIcon('story', 'activate',  "storyID=$story->id", $story);
       common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=&param=0&storyID=$story->id", '', 'button', 'createCase');
 
       common::printDivider();
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index ca7ae6731c..81260de193 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -25,13 +25,13 @@
   {
       ob_start();
       //if(!($task->status != 'closed' and $task->status != 'cancel' and common::printLink('task', 'logEfforts', "taskID=$task->id", $lang->task->buttonLogEfforts))) echo $lang->task->buttonLogEfforts . ' ';
-      common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id");
-      if($this->task->isClickable($task, 'start'))    common::printIcon('task', 'start',    "taskID=$task->id");
-      if($this->task->isClickable($task, 'record'))   common::printIcon('task', 'record',   "taskID=$task->id");
-      if($this->task->isClickable($task, 'finish'))   common::printIcon('task', 'finish',   "taskID=$task->id");
-      if($this->task->isClickable($task, 'close'))    common::printIcon('task', 'close',    "taskID=$task->id");
-      if($this->task->isClickable($task, 'activate')) common::printIcon('task', 'activate', "taskID=$task->id");
-      if($this->task->isClickable($task, 'cancel'))   common::printIcon('task', 'cancel',   "taskID=$task->id");
+      common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task);
+      common::printIcon('task', 'start',    "taskID=$task->id", $task);
+      common::printIcon('task', 'record',   "taskID=$task->id", $task);
+      common::printIcon('task', 'finish',   "taskID=$task->id", $task);
+      common::printIcon('task', 'close',    "taskID=$task->id", $task);
+      common::printIcon('task', 'activate', "taskID=$task->id", $task);
+      common::printIcon('task', 'cancel',   "taskID=$task->id", $task);
 
       common::printDivider();
       common::printIcon('task', 'edit',  "taskID=$task->id");