diff --git a/app/modules/components/color-selector/color-selector.scss b/app/modules/components/color-selector/color-selector.scss
index 2f06ccb0..6bf35ad9 100644
--- a/app/modules/components/color-selector/color-selector.scss
+++ b/app/modules/components/color-selector/color-selector.scss
@@ -15,7 +15,6 @@
     .tag-color {
         @include color-selector-option;
         border: 1px solid $gray-light;
-        border-left: 0;
         border-radius: 0;
         margin: 0;
         transition: background .3s ease-out;
diff --git a/app/partials/epic/epic-detail.jade b/app/partials/epic/epic-detail.jade
index edee4440..977bdf35 100644
--- a/app/partials/epic/epic-detail.jade
+++ b/app/partials/epic/epic-detail.jade
@@ -18,8 +18,8 @@ div.wrapper(
                     on-downvote="ctrl.onDownvote"
                 )
 
-                .detail-header-container
-                    tg-color-selector(
+                .detail-header-container.epic-header-container(ng-class="{blocked: epic.is_blocked}")
+                    tg-color-selector.color-selector(
                         is-required="true"
                         init-color="epic.color"
                         on-select-color="ctrl.onSelectColor(color)"
@@ -28,7 +28,6 @@ div.wrapper(
                         item="epic"
                         project="project"
                         required-perm="modify_epic"
-                        ng-class="{blocked: epic.is_blocked}"
                         ng-if="project && epic"
                         format="text"
                     )
diff --git a/app/styles/modules/epics/epic-detail.scss b/app/styles/modules/epics/epic-detail.scss
new file mode 100644
index 00000000..fe7a80b5
--- /dev/null
+++ b/app/styles/modules/epics/epic-detail.scss
@@ -0,0 +1,10 @@
+.epic-header-container {
+    display: flex;
+    .color-selector {
+        margin-right: .5rem;
+    }
+    tg-detail-header {
+        flex: 1;
+        width: 100%;
+    }
+}