diff --git a/app/partials/includes/modules/admin/project-tags.jade b/app/partials/includes/modules/admin/project-tags.jade
index 2e5ca58e..2692089e 100644
--- a/app/partials/includes/modules/admin/project-tags.jade
+++ b/app/partials/includes/modules/admin/project-tags.jade
@@ -54,25 +54,28 @@ section
                 .status-name(translate="COMMON.FIELDS.NAME")
                 .color-filter
                     input.e2e-tags-filter(
+                        id="filter-tags-input"
                         type="text"
                         name="name"
                         ng-model="tagsFilter.name"
                         ng-model-options="{debounce: 200}"
                     )
-                    tg-svg(
-                        svg-icon="icon-search"
-                    )
+                    label(for="filter-tags-input")
+                        tg-svg(svg-icon="icon-search")
 
         .table-main.table-admin-tags(
             ng-if="projectTagsAll.length"
         )
             div(ng-show="!mixingTags.toTag")
-                .admin-attributes-section-wrapper-empty(
+                .empty-large.admin-attributes-section-wrapper-empty(
                     ng-show="!projectTags.length"
                     tg-loading="ctrl.loading"
                 )
+                    img(
+                        src="/#{v}/images/empty/empty_moon.png"
+                        alt="{{'BACKLOG.EMPTY' | translate}}"
+                    )
                     p(translate="ADMIN.PROJECT_VALUES_TAGS.EMPTY_SEARCH")
-                    p lalalaal
 
                 div(
                     ng-repeat="tag in projectTags"
@@ -154,7 +157,13 @@ section
                     form(tg-bind-scope)
                         .row.mixing-row.table-main.visualization(class="{{ ctrl.mixingClass(tag) }}")
                             .color-column
-                                .current-color(ng-style="{background: tag.color}")
+                                .current-color(
+                                    ng-if="tag.color"
+                                    ng-style="{background: tag.color}"
+                                )
+                                .current-color.empty-color(
+                                    ng-if="!tag.color"
+                                )
 
                             .status-name
                                 span(tg-bo-html="tag.name")
diff --git a/app/styles/layout/admin-project-tags.scss b/app/styles/layout/admin-project-tags.scss
index 3880e826..731eb430 100644
--- a/app/styles/layout/admin-project-tags.scss
+++ b/app/styles/layout/admin-project-tags.scss
@@ -50,16 +50,24 @@
                 padding-left: 1rem;
             }
         }
-        .color-filter {
-            align-items: center;
-            display: flex;
-            flex-grow: 1;
-            padding: 0 10px;
-            position: relative;
+    }
+    .color-filter {
+        align-items: center;
+        display: flex;
+        flex-grow: 1;
+        padding: 0 10px;
+        position: relative;
+        &:hover {
             input {
-                padding: 0;
+                border-bottom: 1px solid $whitish;
             }
         }
+        input {
+            padding: 0;
+        }
+        label {
+            cursor: pointer;
+        }
     }
     .row {
         &.tag-row {
diff --git a/app/styles/modules/common/colors-table.scss b/app/styles/modules/common/colors-table.scss
index 42df79c6..fda0e53d 100644
--- a/app/styles/modules/common/colors-table.scss
+++ b/app/styles/modules/common/colors-table.scss
@@ -117,7 +117,7 @@
     }
 
     .current-color {
-        background-color: $gray-light;
+        background-color: $whitish;
         border-radius: 2px;
         height: 40px;
         width: 40px;