diff --git a/client/src/containers/Items/ItemCategoriesTable.js b/client/src/containers/Items/ItemCategoriesTable.js
index 518400615..4347e9965 100644
--- a/client/src/containers/Items/ItemCategoriesTable.js
+++ b/client/src/containers/Items/ItemCategoriesTable.js
@@ -50,6 +50,7 @@ const ItemsCategoryList = ({
     (category) => (
       <Menu>
         <MenuItem
+          icon={<Icon icon="pen-18" />}
           text={formatMessage({ id: 'edit_category' })}
           onClick={handelEditCategory(category)}
         />
diff --git a/client/src/store/customers/customers.actions.js b/client/src/store/customers/customers.actions.js
index 5b7ef800e..b0be90079 100644
--- a/client/src/store/customers/customers.actions.js
+++ b/client/src/store/customers/customers.actions.js
@@ -59,7 +59,7 @@ export const fetchCustomers = ({ query }) => {
           dispatch({
             type: t.CUSTOMERS_PAGE_SET,
             customers: response.data.customers,
-            customViewId: response.data.customers.customViewId,
+            customViewId: response.data.customers?.viewMeta?.customViewId || -1,
             paginationMeta: response.data.pagination,
           });
           dispatch({
diff --git a/client/src/store/items/items.actions.js b/client/src/store/items/items.actions.js
index b53b69963..ac0e31ddc 100644
--- a/client/src/store/items/items.actions.js
+++ b/client/src/store/items/items.actions.js
@@ -27,7 +27,7 @@ export const fetchItems = ({ query }) => {
           dispatch({
             type: t.ITEMS_PAGE_SET,
             items: response.data.items,
-            customViewId: response.data.customViewId,
+            customViewId: response.data?.filter_meta?.view?.custom_view_id,
             paginationMeta: response.data.pagination,
           });
           dispatch({