diff --git a/module/my/css/project.css b/module/my/css/project.css
index d901cda2e3..01fddb608a 100644
--- a/module/my/css/project.css
+++ b/module/my/css/project.css
@@ -1,4 +1,3 @@
 #programTableList > tr.drop-not-allowed {opacity: 0.1!important}
 #programList .c-actions {overflow: visible;}
-#programList .c-actions .dropdown-menu {padding-left: 8px; padding-right: 8px; margin-top: -4px;}
 #programTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
diff --git a/module/program/model.php b/module/program/model.php
index a18da0b5a0..1ea547b914 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1549,53 +1549,31 @@ class programModel extends model
                     echo "<div class='progress-pie' data-doughnut-size='80' data-color='#00da88'  data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}%</div></div>";
                     break;
                 case 'actions':
-                    if($project->status == 'wait')
-                    {
-                        $method = 'PRJStart';
-                        $icon   = 'start';
-                    }
-                    if($project->status == 'doing')
-                    {
-                        $method = 'PRJClose';
-                        $icon   = 'off';
-                    }
-                    if($project->status == 'suspended')
-                    {
-                        $method = 'PRJStart';
-                        $icon   = 'start';
-                    }
-                    if($project->status == 'closed')
-                    {
-                        $method = 'PRJActivate';
-                        $icon   = 'magic';
-                    }
-                    common::printIcon('program', $method, "programID=$project->id", $project, 'list', $icon, '', 'iframe', true);
-
+                    if($project->status == 'wait' || $project->status == 'suspended') common::printIcon('program', 'PRJStart', "projectID=$project->id", $project, 'list', 'play', '', 'iframe', true);
+                    if($project->status == 'doing') common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'list', 'off', '', 'iframe', true);
+                    if($project->status == 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true);
                     echo "<div class='btn-group'>";
-                    echo "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='context-dropdown' title={$this->lang->more}></button>";
-                    echo "<ul class='dropdown-menu pull-right'>";
-                    common::printIcon('program', 'PRJStart',    "projectID=$project->id", $project, 'list', 'start', '', $project->status == 'wait' ||  $project->status == 'suspended' ? 'hidden' : 'iframe btn-action', true);
-                    common::printIcon('program', 'PRJActivate', "programID=$project->id", $project, 'list', 'magic', '', $project->status == 'closed' ? 'hidden' : 'iframe btn-action', true);
-                    common::printIcon('program', 'PRJSuspend', "programID=$project->id", $project, 'list', 'pause', '', 'iframe btn-action', true);
-                    common::printIcon('program', 'PRJClose', "programID=$project->id", $project, 'list', 'off', '', $project->status == 'doing' ? 'hidden' : 'iframe btn-action', true);
-                    echo "</ul>";
+                      echo "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title='{$this->lang->more}'></button>";
+                      echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
+                      common::printIcon('program', 'PRJSuspend', "projectID=$project->id", $project, 'list', 'pause', '', 'iframe', true);
+                      if($project->status != 'doing') common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'list', 'off', '', 'iframe', true);
+                      if($project->status != 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true);
+                      echo "</ul>";
                     echo "</div>";
-
-                    if(common::hasPriv('program', 'PRJEdit')) echo html::a(helper::createLink("program", "PRJEdit", "programID=$project->id"), "<i class='icon-edit'></i>", '', "class='btn' title='{$this->lang->edit}'");
-                    common::printIcon('program', 'PRJManageMembers', "programID=$project->id", $project, 'list', 'persons');
+                    common::printIcon('program', 'PRJEdit', "projectID=$project->id", $project, 'list', 'edit');
+                    common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'persons');
                     common::printIcon('program', 'PRJGroup', "projectID=$project->id&programID=$programID", $project, 'list', 'lock');
-
                     echo "<div class='btn-group'>";
-                    echo "<button type='button' class='btn icon-more-circle dropdown-toggle' data-toggle='context-dropdown' title={$this->lang->more}></button>";
-                    echo "<ul class='dropdown-menu pull-right'>";
-                    common::printIcon('program', 'PRJManageProducts', "projectID=$project->id&programID=$programID", $project, 'list', 'icon icon-menu-project', '', 'btn-action', true);
-                    common::printIcon('program', 'PRJWhitelist', "projectID=$project->id&programID=$programID", $project, 'list', 'group', '', 'btn-action', true);
-                    if(common::hasPriv('program','PRJDelete')) common::printIcon('program', 'PRJDelete', "projectID=$project->id", $project, 'list', 'trash', 'hiddenwin', 'btn-action', true);
-                    echo "</ul>";
+                      echo "<button type='button' class='btn icon-more-circle dropdown-toggle' data-toggle='dropdown' title='{$this->lang->more}'></button>";
+                      echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
+                        common::printIcon('program', 'PRJManageProducts', "projectID=$project->id", $project, 'list', 'icon icon-menu-project');
+                        common::printIcon('program', 'PRJWhitelist', "projectID=$project->id", $project, 'list', 'group');
+                        if(common::hasPriv('program','PRJDelete')) echo html::a(inLink("prjdelete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PRJDelete}'");
+                      echo "</ul>";
                     echo "</div>";
                     break;
             }
-            echo '</td>'; 
+            echo '</td>';
         }
     }
 }