diff --git a/module/task/css/common.css b/module/task/css/common.css
index 5c6be38e22..842d9c8db3 100644
--- a/module/task/css/common.css
+++ b/module/task/css/common.css
@@ -1,16 +1,27 @@
 .body-modal > .main {padding: 20px;}
 .body-modal > .main .table-form {border: 1px solid #ddd;}
 
+#modalTeam .modal-dialog {padding-bottom: 20px;}
+#modalTeam .modal-content {padding: 0 0 5px; height: 340px;}
+#modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px !important; overflow-y: scroll !important;}
+#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; }
+#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
 #taskTeamEditor tr {padding: 8px 7px 8px 7px;}
 #taskTeamEditor td .chosen-single .chosen-search input,
 #taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
 #taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
 #taskTeamEditor tr td:first-child {width: 40px; position: relative;}
 .team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
-#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
+#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;}
 #taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;}
-
+#taskTeamEditor tr .input-control {display: inline-block; width: 130px; }
+#taskTeamEditor tr .input-control + .input-control {margin-left: 12px; border-left: 1px solid #eee;}
 #modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
 #modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
 #modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
 #modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
+
+#modalTeam .input-control input[type="text"]::input-placeholder{text-align: right;}
+#modalTeam .input-control input[type="text"]::-webkit-input-placeholder{text-align: right;}
+#modalTeam .input-control input[type="text"]::-moz-placeholder{text-align: right;}
+#modalTeam .input-control input[type="text"]::-ms-input-placeholder{text-align: right;}
\ No newline at end of file
diff --git a/module/task/css/create.css b/module/task/css/create.css
index 06d6b03211..6aa2ede9c0 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -28,8 +28,6 @@
 .c-modulel {width: 110px;}
 
 .keep-row-height {height: 32px;}
-#modalTeam .modal-dialog {height: 340px; width: 620px; color: #3c4353;}
-#modalTeam .modal-content {padding: 0 0 5px; height: 340px;}
-#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0;}
-#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
-#modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px!important; overflow-y: scroll!important;}
+#modalTeam .modal-dialog {height: 340px; width: 520px; color: #3c4353;}
+#taskTeamEditor .chosen-single {width: 200px;}
+#taskTeamEditor .estimateBox {width: 120px;}
diff --git a/module/task/css/edit.css b/module/task/css/edit.css
index 16a92a4e26..c878b267d3 100644
--- a/module/task/css/edit.css
+++ b/module/task/css/edit.css
@@ -4,7 +4,4 @@
 #taskTeamEditor .sortable .input-group .input-group-addon.required:after {top: 10px; right: 2px; z-index: 3;}
 #storyIdBox .chosen-container .chosen-drop.chosen-no-wrap>.chosen-results>li {text-overflow: unset;}
 
-#modalTeam .modal-dialog {padding-bottom: 20px;}
 #modalTeam .modal-content {padding: 20px 13px 0; height: 340px;max-height: 296px!important; overflow-y: scroll!important;}
-#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; }
-#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php
index 2c7995aad8..28ca7dee5f 100644
--- a/module/task/view/taskteam.html.php
+++ b/module/task/view/taskteam.html.php
@@ -37,12 +37,18 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
   </td>
   <td>
     <div class='input-group'>
-      <span class="input-group-addon <?php echo zget($requiredFields, 'estimate', '', ' required');?>"><?php echo $lang->task->estimate?></span>
-      <?php echo html::input("teamEstimate[]", (float)$member->estimate, "class='form-control text-center' placeholder='{$lang->task->hour}'" . ($hourDisabled ? ' readonly' : ''))?>
-      <span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
-      <?php echo html::input("teamConsumed[]", (float)$member->consumed, "class='form-control text-center' readonly placeholder='{$lang->task->hour}'")?>
-      <span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
-      <?php echo html::input("teamLeft[]", (float)$member->left, "class='form-control text-center' placeholder='{$lang->task->hour}'" . ($hourDisabled ? ' readonly' : ''))?>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamEstimate[]", (float)$member->estimate, "class='form-control text-center' placeholder='{$lang->task->estimate}'" . ($hourDisabled ? ' readonly' : ''))?>
+        <label class="input-control-icon-right">h</label>
+      </div>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamConsumed[]", (float)$member->consumed, "class='form-control text-center' readonly placeholder='{$lang->task->consumed}'")?>
+        <label class="input-control-icon-right">h</label>
+      </div>
+      <div class="input-control has-icon-right">
+      <?php echo html::input("teamLeft[]", (float)$member->left, "class='form-control text-center' placeholder='{$lang->task->left}'" . ($hourDisabled ? ' readonly' : ''))?>
+        <label class="input-control-icon-right">h</label>
+      </div>
     </div>
   </td>
   <td class='w-130px sort-handler'>
@@ -61,11 +67,11 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
     <span class="team-number"><?php echo $i;?></span>
     <i class="icon icon-angle-down <?php echo $hiddenArrow;?>"></i>
   </td>
-  <td class='w-250px'>
+  <td class='w-240px'>
     <?php echo html::select("team[]", $members, '', "class='form-control chosen'")?>
     <?php echo html::hidden("teamSource[]", '');?>
   </td>
-  <td>
+  <td class='w-130px'>
     <?php if(empty($task->team)):?>
     <div class='input-group estimateBox'>
       <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->estimateAB}'") ?>
@@ -73,16 +79,22 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
     </div>
     <?php else:?>
     <div class='input-group'>
-      <span class="input-group-addon <?php echo zget($requiredFields, 'estimate', '', ' required');?>"><?php echo $lang->task->estimate?></span>
-      <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
-      <span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
-      <?php echo html::input("teamConsumed[]", 0, "class='form-control text-center' readonly placeholder='{$lang->task->hour}'")?>
-      <span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
-      <?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->estimate}'")?>
+        <label class="input-control-icon-right">h</label>
+      </div>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamConsumed[]", 0, "class='form-control text-center' readonly placeholder='{$lang->task->consumed}'")?>
+        <label class="input-control-icon-right">h</label>
+      </div>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->left}'")?>
+        <label class="input-control-icon-right">h</label>
+      </div>
     </div>
     <?php endif;?>
   </td>
-  <td class='w-130px sort-handler'>
+  <td class='w-100px sort-handler'>
     <button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
     <button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
     <?php if(empty($task->mode) or $task->mode == 'linear'):?>