diff --git a/app/modules/components/tags/components/add-tag-input.jade b/app/modules/components/tags/components/add-tag-input.jade
index 5e8de537..62b8cf1c 100644
--- a/app/modules/components/tags/components/add-tag-input.jade
+++ b/app/modules/components/tags/components/add-tag-input.jade
@@ -22,6 +22,7 @@
     tg-color-selector(
         ng-if="!vm.disableColorSelection"
         on-select-color="vm.selectColor(color)"
+        is-color-required="false"
     )
 
     tg-svg.save(
diff --git a/app/partials/includes/modules/admin/project-tags.jade b/app/partials/includes/modules/admin/project-tags.jade
index 2692089e..61538b00 100644
--- a/app/partials/includes/modules/admin/project-tags.jade
+++ b/app/partials/includes/modules/admin/project-tags.jade
@@ -6,16 +6,11 @@ section
 
     .admin-tags-section-wrapper
         form.add-tag-container.new-value.hidden
-            tg-color-selection.color-column(
-                tg-allow-empty="true"
+            tg-color-selector.color-column(
+                is-color-required="false"
                 ng-model="newValue"
+                on-select-color="newValue.color = color"
             )
-                .current-color(
-                    ng-style="{background: newValue.color}"
-                    ng-if="newValue.color"
-                )
-                .current-color.empty-color(ng-if="!newValue.color")
-                include ../../components/select-color
 
             .tag-name
                 input(
@@ -115,17 +110,11 @@ section
                                     )
 
                         .row.tag-row.table-main.edition.hidden
-                            .color-column(
-                                tg-color-selection
-                                tg-allow-empty="true"
+                            tg-color-selector.color-column(
+                                is-color-required="false"
                                 ng-model="tag"
+                                on-select-color="tag.color = color"
                             )
-                                .current-color(
-                                    ng-style="{background: tag.color}"
-                                    ng-if="tag.color"
-                                )
-                                .current-color.empty-color(ng-if="!tag.color")
-                                include ../../components/select-color
 
                             .status-name
                                 input(
diff --git a/app/styles/layout/admin-project-tags.scss b/app/styles/layout/admin-project-tags.scss
index 731eb430..d9d7fedf 100644
--- a/app/styles/layout/admin-project-tags.scss
+++ b/app/styles/layout/admin-project-tags.scss
@@ -27,7 +27,10 @@
         background: $white;
     }
     .icon {
-        opacity: 1;
+        &.icon-close,
+        &.icon-save {
+            opacity: 1;
+        }
     }
 }