diff --git a/module/story/css/change.css b/module/story/css/change.css
index 18629745f7..c82effceff 100644
--- a/module/story/css/change.css
+++ b/module/story/css/change.css
@@ -2,6 +2,9 @@
 #affectedProjects .table + h6 {border-top: 1px solid #ddd;}
 .nav-tabs>li>a {height: 36px;}
 .table-form>tbody>tr>th {width: 100px !important;}
-.colorpicker {right: 7px; top: 7px; opacity: 1;}
+.colorpicker {right: -1px; top: 7px; opacity: 1;}
 #twinsList td, #twinsTitle td {padding-left: 65px;}
 #twinsTitle td {font-weight: 700;}
+
+.title-group.required:after {display: none;}
+.title-group.required > .required:after {display: block; right: 32px; top: 5px;}
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index f3f55eb0b9..418efb3e74 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -44,19 +44,23 @@
         <tr>
           <th><?php echo $lang->story->title;?></th>
           <td>
-            <div class="colorpicker">
-              <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" title="<?php echo $lang->task->colorTag ?>"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
-              <ul class="dropdown-menu clearfix">
-                <li class="heading"><?php echo $lang->story->colorTag; ?><i class="icon icon-close"></i></li>
-              </ul>
-              <input type="hidden" class="colorpicker" id="color" name="color" value="<?php echo $story->color ?>" data-icon="color" data-wrapper="input-control-icon-right" data-update-color=".story-title"  data-provide="colorpicker">
+            <div class='input-group title-group'>
+              <div class="input-control has-icon-right">
+                <?php echo html::input('title', $story->title, 'class="form-control story-title"');?>
+                <div class="colorpicker">
+                  <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" title="<?php echo $lang->task->colorTag ?>"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+                  <ul class="dropdown-menu clearfix">
+                    <li class="heading"><?php echo $lang->story->colorTag; ?><i class="icon icon-close"></i></li>
+                  </ul>
+                  <input type="hidden" class="colorpicker" id="color" name="color" value="<?php echo $story->color ?>" data-icon="color" data-wrapper="input-control-icon-right" data-update-color=".story-title"  data-provide="colorpicker">
+                </div>
+              </div>
+              <?php if(!empty($story->twins)):?>
+              <div class="input-group-addon">
+                <?php echo html::checkbox('relievedTwins', $lang->story->relievedTwinsRelation, '', "id='relievedTwins' title='{$lang->story->changeRelievedTwinsTips}'");?>
+              </div>
+              <?php endif;?>
             </div>
-            <?php echo html::input('title', $story->title, 'class="form-control story-title"');?>
-            <?php if(!empty($story->twins)):?>
-            <div class="input-group-addon">
-              <?php echo html::checkbox('relievedTwins', $lang->story->relievedTwinsRelation, '', "id='relievedTwins' title='{$lang->story->changeRelievedTwinsTips}'");?>
-            </div>
-            <?php endif;?>
           </td>
         </tr>
         <tr>