diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee
index 82d43e97..a0063ccb 100644
--- a/app/coffee/modules/issues/list.coffee
+++ b/app/coffee/modules/issues/list.coffee
@@ -658,8 +658,8 @@ IssuesFiltersDirective = ($log, $location, $rs, $confirm, $loading, $template, $
 
     return {link:link}
 
-module.directive("tgIssuesFilters", ["$log", "$tgLocation", "$tgResources", "$tgConfirm", "$tgLoading", "$tgTemplate", "$translate",
-                                     IssuesFiltersDirective])
+module.directive("tgIssuesFilters", ["$log", "$tgLocation", "$tgResources", "$tgConfirm", "$tgLoading",
+                                     "$tgTemplate", "$translate", IssuesFiltersDirective])
 
 
 #############################################################################
@@ -748,7 +748,8 @@ IssueStatusInlineEditionDirective = ($repo, $template, $rootscope) ->
 
     return {link: link}
 
-module.directive("tgIssueStatusInlineEdition", ["$tgRepo", "$tgTemplate", "$rootScope", IssueStatusInlineEditionDirective])
+module.directive("tgIssueStatusInlineEdition", ["$tgRepo", "$tgTemplate", "$rootScope",
+                                                IssueStatusInlineEditionDirective])
 
 
 #############################################################################
@@ -799,4 +800,5 @@ IssueAssignedToInlineEditionDirective = ($repo, $rootscope, popoverService) ->
 
     return {link: link}
 
-module.directive("tgIssueAssignedToInlineEdition", ["$tgRepo", "$rootScope", IssueAssignedToInlineEditionDirective])
+module.directive("tgIssueAssignedToInlineEdition", ["$tgRepo", "$rootScope",
+                                                    IssueAssignedToInlineEditionDirective])
diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json
index 5e667b78..1fa780dc 100644
--- a/app/locales/locale-en.json
+++ b/app/locales/locale-en.json
@@ -744,33 +744,44 @@
         "TITLE_NEXT_ISSUE": "next issue",
         "ACTION_DELETE": "Delete issue",
         "LIGHTBOX_TITLE_BLOKING_ISSUE": "Blocking issue",
-        "FIELDS": {
-            "PRIORITY": "priority",
-            "SEVERITY": "severity",
-            "TYPE": "type"
-        },
         "CONFIRM_PROMOTE": {
             "TITLE": "Promote this issue to a new user story",
             "MESSAGE": "Are you sure you want to create a new US from this Issue?"
         },
         "FILTERS": {
+            "TITLE": "Filters",
+            "INPUT_SEARCH_PLACEHOLDER": "Subject or ref",
+            "TITLE_ACTION_SEARCH": "Search",
             "ACTION_SAVE_CUSTOM_FILTER": "save as custom filter",
+            "BREADCRUMB": "Filters",
+            "TITLE_BREADCRUMB": "Filters",
+            "CATEGORIES": {
+                "TYPE": "Type",
+                "STATUS": "Status",
+                "SEVERITY": "Severity",
+                "PRIORITIES": "Priorities",
+                "TAGS": "Tags",
+                "ASSIGNED_TO": "Assigned to",
+                "CREATED_BY": "Created by",
+                "CUSTOM_FILTERS": "Custom filters"
+            },
             "CONFIRM_DELETE": {
                 "TITLE": "Delete custom filter",
                 "MESSAGE": "the custom filter '{{customFilterName}}'"
-            },
-            "FILTER_CATEGORY_TYPE": "Type",
-            "FILTER_CATEGORY_STATUS": "Status",
-            "FILTER_CATEGORY_SEVERITY": "Severity",
-            "FILTER_CATEGORY_PRIORITIES": "Priorities",
-            "FILTER_CATEGORY_TAGS": "Tags",
-            "FILTER_CATEGORY_ASSIGNED_TO": "Assigned to",
-            "FILTER_CATEGORY_CREATED_BY": "Created by",
-            "CUSTOM_FILTERS": "Custom filters"
+            }
         },
         "TABLE": {
-            "COLUMN_CREATED": "Created",
+            "COLUMNS": {
+                "TYPE": "Type",
+                "SEVERITY": "Severity",
+                "PRIORITY": "Priority",
+                "SUBJECT": "Subject",
+                "STATUS": "Status",
+                "CREATED": "Created",
+                "ASSIGNED_TO": "Assigned to"
+            },
             "TITLE_ACTION_CHANGE_STATUS": "Change status",
+            "TITLE_ACTION_ASSIGNED_TO": "Assigned to",
             "EMPTY": {
                 "TITLE": "There are no issues to report :-)",
                 "SUBTITLE": "Did you find an issue?",
diff --git a/app/partials/includes/modules/issues-filters.jade b/app/partials/includes/modules/issues-filters.jade
index 58e3e202..3b427086 100644
--- a/app/partials/includes/modules/issues-filters.jade
+++ b/app/partials/includes/modules/issues-filters.jade
@@ -1,52 +1,54 @@
 section.filters
     div.filters-inner
         h1
-            span.title(translate="COMMON.FILTERS.TITLE")
+            span.title(translate="ISSUES.FILTERS.TITLE")
         form
             fieldset
-                input(type="text", placeholder="{{'COMMON.FILTERS.INPUT_PLACEHOLDER' | translate}}", ng-model="filtersQ")
-                a.icon.icon-search(href="", title="{{'COMMON.FILTERS.TITLE_ACTION_FILTER_BUTTON' | translate}}")
+                input(type="text", placeholder="{{'ISSUES.FILTERS.INPUT_SEARCH_PLACEHOLDER' | translate}}",
+                      ng-model="filtersQ")
+                a.icon.icon-search(href="", title="{{'ISSUES.FILTERS.TITLE_ACTION_SEARCH' | translate}}")
         div.filters-step-cat
             div.filters-applied
             a.hide.button.button-gray.save-filters(href="", title="{{'COMMON.SAVE' | translate}}", ng-class="{hide: filters.length}", translate="ISSUES.FILTERS.ACTION_SAVE_CUSTOM_FILTER")
             h2.hidden.breadcrumb
-                a.back(href="", title="{{'COMMON.FILTERS.BREADCRUB_TITLE' | translate}}", translate="COMMON.FILTERS.BREADCRUMB_FILTERS")
+                a.back(href="", title="{{'ISSUES.FILTERS.TITLE_BREADCRUMB' | translate}}", translate="ISSUES.FILTERS.BREADCRUMB")
                 span.icon-arrow-right
                 a.subfilter(href="", title="cat-name")
                     span.title(translate="COMMON.FILTERS.BREADCRUMB_STATUS")
             div.filters-cats
                 ul
                     li
-                        a(href="", title="Type", data-type="types")
-                            span.title(translate="ISSUES.FILTERS.FILTER_CATEGORY_TYPE")
+                        a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.TYPE' | translate}}", data-type="types")
+                            span.title(translate="ISSUES.FILTERS.CATEGORIES.TYPE")
                             span.icon.icon-arrow-right
                     li
-                        a(href="", title="Status", data-type="statuses")
-                            span.title(translate="ISSUES.FILTERS.FILTER_CATEGORY_STATUS")
+                        a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.STATUS' | translate}}", data-type="statuses")
+                            span.title(translate="ISSUES.FILTERS.CATEGORIES.STATUS")
                             span.icon.icon-arrow-right
                     li
-                        a(href="", title="Severity", data-type="severities")
-                            span.title(translate="ISSUES.FILTERS.FILTER_CATEGORY_SEVERITY")
+                        a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.SEVERITY' | translate}}", data-type="severities")
+                            span.title(translate="ISSUES.FILTERS.CATEGORIES.SEVERITY")
                             span.icon.icon-arrow-right
                     li
-                        a(href="", title="Priorities", data-type="priorities")
-                            span.title(translate="ISSUES.FILTERS.FILTER_CATEGORY_PRIORITIES")
+                        a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.PRIORITIES' | translate}}", data-type="priorities")
+                            span.title(translate="ISSUES.FILTERS.CATEGORIES.PRIORITIES")
                             span.icon.icon-arrow-right
                     li
-                        a(href="", title="Tags", data-type="tags")
-                            span.title(translate="ISSUES.FILTERS.FILTER_CATEGORY_TAGS")
+                        a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.TAGS' | translate}}", data-type="tags")
+                            span.title(translate="ISSUES.FILTERS.CATEGORIES.TAGS")
                             span.icon.icon-arrow-right
                     li
-                        a(href="", title="Assigned to", data-type="assignedTo")
-                            span.title(translate="ISSUES.FILTERS.FILTER_CATEGORY_ASSIGNED_TO")
+                        a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.ASSIGNED_TO' | translate}}", data-type="assignedTo")
+                            span.title(translate="ISSUES.FILTERS.CATEGORIES.ASSIGNED_TO")
                             span.icon.icon-arrow-right
                     li
-                        a(href="", title="Created by", data-type="createdBy")
-                            span.title(translate="ISSUES.FILTERS.FILTER_CATEGORY_CREATED_BY")
+                        a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.CREATED_BY' | translate}}", data-type="createdBy")
+                            span.title(translate="ISSUES.FILTERS.CATEGORIES.CREATED_BY")
                             span.icon.icon-arrow-right
                     li.custom-filters(ng-if="filters.myFilters.length")
-                        a(href="", title="{{'ISSUES.FILTERS.CUSTOM_FILTERS' | translate}}", data-type="myFilters")
-                            span.title(translate="ISSUES.FILTERS.CUSTOM_FILTERS")
+                        a(href="", title="{{ 'ISSUES.FILTERS.CATEGORIES.CUSTOM_FILTERS' | translate}}",
+                          data-type="myFilters")
+                            span.title(translate="ISSUES.FILTERS.CATEGORIES.CUSTOM_FILTERS")
                             span.icon.icon-arrow-right
 
         div.filter-list.hidden
diff --git a/app/partials/includes/modules/issues-table.jade b/app/partials/includes/modules/issues-table.jade
index 4523e9ff..d3672c83 100644
--- a/app/partials/includes/modules/issues-table.jade
+++ b/app/partials/includes/modules/issues-table.jade
@@ -1,18 +1,20 @@
 section.issues-table.basic-table(ng-class="{empty: !issues.length}")
     div.row.title
-        div.level-field(data-fieldname="type", translate="ISSUES.FIELDS.TYPE")
-        div.level-field(data-fieldname="severity", translate="ISSUES.FIELDS.SEVERITY")
-        div.level-field(data-fieldname="priority", translate="ISSUES.FIELDS.PRIORITY")
-        div.subject(data-fieldname="subject", translate="COMMON.FIELDS.SUBJECT")
-        div.issue-field(data-fieldname="status", translate="COMMON.FIELDS.STATUS")
-        div.created-field(data-fieldname="created_date", translate="ISSUES.TABLE.COLUMN_CREATED")
-        div.assigned-field(data-fieldname="assigned_to", translate="COMMON.FIELDS.ASSIGNED_TO")
+        div.level-field(data-fieldname="type", translate="ISSUES.TABLE.COLUMNS.TYPE")
+        div.level-field(data-fieldname="severity", translate="ISSUES.TABLE.COLUMNS.SEVERITY")
+        div.level-field(data-fieldname="priority", translate="ISSUES.TABLE.COLUMNS.PRIORITY")
+        div.subject(data-fieldname="subject", translate="ISSUES.TABLE.COLUMNS.SUBJECT")
+        div.issue-field(data-fieldname="status", translate="ISSUES.TABLE.COLUMNS.STATUS")
+        div.created-field(data-fieldname="created_date", translate="ISSUES.TABLE.COLUMNS.CREATED")
+        div.assigned-field(data-fieldname="assigned_to", translate="ISSUES.TABLE.COLUMNS.ASSIGNED_TO")
+
     div.row.table-main(ng-repeat="issue in issues track by issue.id")
         div.level-field(tg-listitem-type="issue")
         div.level-field(tg-listitem-severity="issue")
         div.level-field(tg-listitem-priority="issue")
         div.subject
-            a(href="", tg-nav="project-issues-detail:project=project.slug,ref=issue.ref", title="#{{ ::issue.ref }} {{ ::issue.subject }}")
+            a(href="", tg-nav="project-issues-detail:project=project.slug,ref=issue.ref",
+              title="#{{ ::issue.ref }} {{ ::issue.subject }}")
                 span(tg-bo-ref="issue.ref")
                 span(ng-bind="issue.subject")
 
@@ -24,7 +26,7 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}")
         div.created-field(tg-bo-bind="issue.created_date|momentFormat:'DD MMM YYYY HH:mm'")
 
         div.assigned-field(tg-issue-assigned-to-inline-edition="issue")
-            div.issue-assignedto(title="{{'COMMON.FIELDS.ASSIGNED_TO' | translate}}")
+            div.issue-assignedto(title="{{'ISSUES.TABLE.TITLE_ACTION_ASSIGNED_TO' | translate}}")
                 figure.avatar
                 span.icon.icon-arrow-bottom(tg-check-permission="modify_issue")
 
@@ -32,4 +34,6 @@ section.empty.empty-issues(ng-class="{hidden: issues.length}")
     span.icon.icon-issues
     span.title(translate="ISSUES.TABLE.EMPTY.TITLE")
     span(translate="ISSUES.TABLE.EMPTY.SUBTITLE")
-    a(href="", title="{{'ISSUES.TABLE.EMPTY.ACTION_CREATE_ISSUE' | translate}}", ng-click="ctrl.addNewIssue()", translate="ISSUES.TABLE.EMPTY.ACTION_CREATE_ISSUE")
+    a(href="", ng-click="ctrl.addNewIssue()",
+      title="{{'ISSUES.TABLE.EMPTY.ACTION_CREATE_ISSUE' | translate}}",
+      translate="ISSUES.TABLE.EMPTY.ACTION_CREATE_ISSUE")