diff --git a/module/execution/model.php b/module/execution/model.php
index 91468449ee..bc4b048e4c 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4374,7 +4374,14 @@ class executionModel extends model
             }
         }
 
-        common::printIcon('programplan', 'edit', "stageID=$execution->id&projectID=$execution->project", $execution, 'list', '', '', 'iframe', true);
+        if($execution->type == 'stage')
+        {
+            common::printIcon('programplan', 'edit', "stageID=$execution->id&projectID=$execution->project", $execution, 'list', '', '', 'iframe', true);
+        }
+        else
+        {
+            common::printIcon('execution', 'edit', "executionID=$execution->id", $execution, 'list', '', '', 'iframe', true);
+        }
 
         $disabled = !empty($execution->children) ? ' disabled' : '';
         if($execution->status != 'closed' and common::hasPriv('execution', 'close', $execution))
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 4f96d88413..59fa5c2cc1 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -54,7 +54,7 @@
   <?php $canBatchEdit = common::hasPriv('execution', 'batchEdit'); ?>
   <form class='main-table' id='executionForm' method='post' data-ride='table' data-nested='true' data-expand-nest-child='false' data-checkable='false' data-enable-empty-nested-row='true' data-replace-id='executionTableList' data-preserve-nested='true'>
     <table class="table table-from table-fixed table-nested" id="executionList">
-      <?php $vars = "status=$status&orderBy=%s";?>	
+      <?php $vars = "status=$status&orderBy=%s";?>
       <thead>
         <tr>
           <th class='table-nest-title'>
@@ -70,7 +70,7 @@
           <th class='c-hours'><?php echo $lang->task->consumedAB;?></th>
           <th class='c-hours'><?php echo $lang->task->leftAB;?> </th>
           <th class='c-progress'><?php echo $lang->execution->burn;?> </th>
-          <th class='text-center c-actions-6'><?php echo $lang->actions;?></th> 
+          <th class='text-center c-actions-6'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody id="executionTableList">