diff --git a/src/attributes/components/AttributeDetails/AttributeDetails.tsx b/src/attributes/components/AttributeDetails/AttributeDetails.tsx
index 1d9e4e3e3..9b3914895 100644
--- a/src/attributes/components/AttributeDetails/AttributeDetails.tsx
+++ b/src/attributes/components/AttributeDetails/AttributeDetails.tsx
@@ -34,7 +34,7 @@ const AttributeDetails: React.FC<AttributeDetailsProps> = ({
     {
       label: intl.formatMessage({
         defaultMessage: "Dropdown",
-        description: "attribute editor component type",
+        description: "product attribute type",
         id: "attributeDetailsInputTypeDropdown"
       }),
       value: AttributeInputTypeEnum.DROPDOWN
@@ -42,7 +42,7 @@ const AttributeDetails: React.FC<AttributeDetailsProps> = ({
     {
       label: intl.formatMessage({
         defaultMessage: "Multiple Select",
-        description: "attribute editor component type",
+        description: "product attribute type",
         id: "attributeDetailsInputTypeMultiselect"
       }),
       value: AttributeInputTypeEnum.MULTISELECT
@@ -52,9 +52,7 @@ const AttributeDetails: React.FC<AttributeDetailsProps> = ({
   return (
     <Card>
       <CardTitle
-        title={
-          intl.formatMessage(commonMessages.generalInformations)
-        }
+        title={intl.formatMessage(commonMessages.generalInformations)}
       />
       <CardContent>
         <TextField
@@ -62,7 +60,7 @@ const AttributeDetails: React.FC<AttributeDetailsProps> = ({
           error={!!errors.name}
           label={intl.formatMessage({
             defaultMessage: "Default Label",
-            description: "attribute label input field",
+            description: "attribute's label",
             id: "attributeDetailsNameInputLabel"
           })}
           name={"name" as keyof AttributePageFormData}
@@ -77,7 +75,7 @@ const AttributeDetails: React.FC<AttributeDetailsProps> = ({
           error={!!errors.slug}
           label={intl.formatMessage({
             defaultMessage: "Attribute Code",
-            description: "attribute slug input field",
+            description: "attribute's slug short code label",
             id: "attributeDetailsSlugInputLabel"
           })}
           name={"slug" as keyof AttributePageFormData}
@@ -103,7 +101,7 @@ const AttributeDetails: React.FC<AttributeDetailsProps> = ({
           hint={errors.inputType}
           label={intl.formatMessage({
             defaultMessage: "Catalog Input type for Store Owner",
-            description: "attribute editor component type select field label",
+            description: "attribute's editor component",
             id: "attributeDetailsInputTypeField"
           })}
           name="inputType"
diff --git a/src/attributes/components/AttributeList/AttributeList.tsx b/src/attributes/components/AttributeList/AttributeList.tsx
index c86b16104..bb6b1cffb 100644
--- a/src/attributes/components/AttributeList/AttributeList.tsx
+++ b/src/attributes/components/AttributeList/AttributeList.tsx
@@ -85,35 +85,34 @@ const AttributeList: React.StatelessComponent<AttributeListProps> = ({
         <TableCell className={classes.colSlug}>
           <FormattedMessage
             defaultMessage="Attribute Code"
-            description="attribute list: slug column header"
             id="attributeListSlugColumnHeader"
           />
         </TableCell>
         <TableCell className={classes.colName}>
           <FormattedMessage
             defaultMessage="Default Label"
-            description="attribute list: name column header"
+            description="attribute's label'"
             id="attributeListNameColumnHeader"
           />
         </TableCell>
         <TableCell className={classes.colVisible}>
           <FormattedMessage
             defaultMessage="Visible"
-            description="attribute list: visibility column header"
+            description="attribute is visible"
             id="attributeListVisibilityColumnHeader"
           />
         </TableCell>
         <TableCell className={classes.colSearchable}>
           <FormattedMessage
             defaultMessage="Searchable"
-            description="attribute list: attribute can be searched in dashboard column header"
+            description="attribute can be searched in dashboard"
             id="attributeListSearchableColumnHeader"
           />
         </TableCell>
         <TableCell className={classes.colFaceted}>
           <FormattedMessage
             defaultMessage="Use in faceted search"
-            description="attribute list: attribute can be searched in storefront column header"
+            description="attribute can be searched in storefront"
             id="attributeListFacetedColumnHeader"
           />
         </TableCell>
@@ -188,7 +187,6 @@ const AttributeList: React.StatelessComponent<AttributeListProps> = ({
               <TableCell colSpan={numberOfColumns}>
                 <FormattedMessage
                   defaultMessage="No attributes found"
-                  description="no attributes found with present filters"
                   id="AttributeListNoAttributes"
                 />
               </TableCell>