diff --git a/client/src/containers/Sales/Estimate/EstimateActionsBar.js b/client/src/containers/Sales/Estimate/EstimateActionsBar.js
index 7f6c6abbc..bf767328e 100644
--- a/client/src/containers/Sales/Estimate/EstimateActionsBar.js
+++ b/client/src/containers/Sales/Estimate/EstimateActionsBar.js
@@ -3,8 +3,6 @@ import Icon from 'components/Icon';
 import {
   Button,
   Classes,
-  Menu,
-  MenuItem,
   Popover,
   NavbarDivider,
   NavbarGroup,
@@ -38,7 +36,7 @@ function EstimateActionsBar({
 
   // #withEstimateActions
   addEstimatesTableQueries,
-
+  changeEstimateView,
   // #own Porps
   onFilterChanged,
   selectedRows = [],
@@ -52,48 +50,25 @@ function EstimateActionsBar({
     history.push('/estimates/new');
   }, [history]);
 
-  // const filterDropdown = FilterDropdown({
-  //   fields: resourceFields,
-  //   initialCondition: {
-  //     fieldKey: 'estimate_number',
-  //     compatator: 'contains',
-  //     value: '',
-  //   },
-  //   onFilterChange: (filterConditions) => {
-  //     setFilterCount(filterConditions.length || 0);
-  //     addEstimatesTableQueries({
-  //       filter_roles: filterConditions || '',
-  //     });
-  //     onFilterChanged && onFilterChanged(filterConditions);
-  //   },
-  // });
-
   const hasSelectedRows = useMemo(() => selectedRows.length > 0, [
     selectedRows,
   ]);
 
-  const viewsMenuItems = estimateViews.map((view) => {
-    return (
-      <MenuItem href={`${path}/${view.id}/custom_view`} text={view.name} />
-    );
-  });
-
+  const handleTabChange = (viewId) => {
+    changeEstimateView(viewId.id || -1);
+    addEstimatesTableQueries({
+      custom_view_id: viewId.id || null,
+    });
+  };
+  
   return (
     <DashboardActionsBar>
       <NavbarGroup>
-        <Popover
-          content={<Menu>{viewsMenuItems}</Menu>}
-          minimal={true}
-          interactionKind={PopoverInteractionKind.HOVER}
-          position={Position.BOTTOM_LEFT}
-        >
-          <Button
-            className={classNames(Classes.MINIMAL, 'button--table-views')}
-            icon={<Icon icon="table-16" iconSize={16} />}
-            text={<T id={'table_views'} />}
-            rightIcon={'caret-down'}
-          />
-        </Popover>
+        <DashboardActionViewsList
+          resourceName={'estimates'}
+          views={estimateViews}
+          onChange={handleTabChange}
+        />
 
         <NavbarDivider />
         <Button
@@ -151,7 +126,7 @@ function EstimateActionsBar({
 }
 
 const mapStateToProps = (state, props) => ({
-  resourceName: 'sales_estimates',
+  resourceName: 'sale_estimate',
 });
 const withEstimateActionsBar = connect(mapStateToProps);
 
diff --git a/client/src/containers/Sales/Estimate/EstimateList.js b/client/src/containers/Sales/Estimate/EstimateList.js
index b6dae06e4..65629c6af 100644
--- a/client/src/containers/Sales/Estimate/EstimateList.js
+++ b/client/src/containers/Sales/Estimate/EstimateList.js
@@ -49,18 +49,19 @@ function EstimateList({
 
   const [selectedRows, setSelectedRows] = useState([]);
 
-  // const fetchResourceViews = useQuery(
-  //   ['resource-views', 'sales_estimates'],
-  //   (key, resourceName) => requestFetchResourceViews(resourceName),
-  // );
+  const fetchResourceViews = useQuery(
+    ['resource-views', 'sale_estimate'],
+    (key, resourceName) => requestFetchResourceViews(resourceName),
+  );
 
-  // const fetchResourceFields = useQuery(
-  //   ['resource-fields', 'sales_estimates'],
-  //   (key, resourceName) => requestFetchResourceFields(resourceName),
-  // );
+  const fetchResourceFields = useQuery(
+    ['resource-fields', 'sale_estimate'],
+    (key, resourceName) => requestFetchResourceFields(resourceName),
+  );
 
-  const fetchEstimate = useQuery(['estimates-table', estimatesTableQuery], () =>
-    requestFetchEstimatesTable(),
+  const fetchEstimate = useQuery(
+    ['estimates-table', estimatesTableQuery],
+    (key, _query) => requestFetchEstimatesTable({ ..._query }),
   );
 
   useEffect(() => {
@@ -117,7 +118,7 @@ function EstimateList({
         queryCache.invalidateQueries('estimates-table');
       })
       .catch((error) => {
-        // setDeliverEstimate(false);
+        setDeliverEstimate(false);
       });
   }, [deliverEstimate, requestDeliverdEstimate, formatMessage]);
 
@@ -145,7 +146,7 @@ function EstimateList({
         queryCache.invalidateQueries('estimates-table');
       })
       .catch((error) => {
-        // setApproveEstimate(false);
+        setApproveEstimate(false);
       });
   }, [approveEstimate, requestApproveEstimate, formatMessage]);
 
@@ -176,7 +177,7 @@ function EstimateList({
   }, [rejectEstimate, requestRejectEstimate, formatMessage]);
 
   // Handle filter change to re-fetch data-table.
-  const handleFilterChanged = useCallback(() => {}, [fetchEstimate]);
+  const handleFilterChanged = useCallback(() => {}, []);
 
   // Calculates the selected rows
   const selectedRowsCount = useMemo(() => Object.values(selectedRows).length, [
@@ -198,8 +199,8 @@ function EstimateList({
   );
   return (
     <DashboardInsider
-      // loading={fetchResourceViews.isFetching || fetchResourceFields.isFetching}
-      name={'sales_estimates'}
+      loading={fetchResourceViews.isFetching || fetchResourceFields.isFetching}
+      name={'sale_estimate'}
     >
       <EstimateActionsBar
         // onBulkDelete={}
diff --git a/client/src/containers/Sales/Estimate/EstimateViewTabs.js b/client/src/containers/Sales/Estimate/EstimateViewTabs.js
index 5d2ec86cd..bc416be5c 100644
--- a/client/src/containers/Sales/Estimate/EstimateViewTabs.js
+++ b/client/src/containers/Sales/Estimate/EstimateViewTabs.js
@@ -6,7 +6,6 @@ import { connect } from 'react-redux';
 import { pick, debounce } from 'lodash';
 
 import { DashboardViewsTabs } from 'components';
-import { useUpdateEffect } from 'hooks';
 
 import withEstimates from './withEstimates';
 import withEstimateActions from './withEstimateActions';
@@ -15,6 +14,9 @@ import withViewDetails from 'containers/Views/withViewDetails';
 
 import { compose } from 'utils';
 
+/**
+ * Estimates views tabs.
+ */
 function EstimateViewTabs({
   // #withExpenses
   estimateViews,
@@ -37,53 +39,35 @@ function EstimateViewTabs({
   const { custom_view_id: customViewId = null } = useParams();
 
   useEffect(() => {
-    changeEstimateView(customViewId || -1);
     setTopbarEditView(customViewId);
     changePageSubtitle(customViewId && viewItem ? viewItem.name : '');
-
-    addEstimatesTableQueries({
-      custom_view_id: customViewId,
-    });
-    return () => {
-      setTopbarEditView(null);
-      changePageSubtitle('');
-      changeEstimateView(null);
-    };
-  }, [customViewId, addEstimatesTableQueries, changeEstimateView]);
-
-  useUpdateEffect(() => {
-    onViewChanged && onViewChanged(customViewId);
   }, [customViewId]);
 
-  const debounceChangeHistory = useRef(
-    debounce((toUrl) => {
-      history.push(toUrl);
-    }, 250),
-  );
-
-  const handleTabsChange = (viewId) => {
-    const toPath = viewId ? `${viewId}/custom_view` : '';
-    debounceChangeHistory.current(`/estimates/${toPath}`);
-    setTopbarEditView(viewId);
-  };
   const tabs = estimateViews.map((view) => ({
     ...pick(view, ['name', 'id']),
   }));
 
+  const handleTabsChange = (viewId) => {
+    changeEstimateView(viewId || -1);
+    addEstimatesTableQueries({
+      custom_view_id: viewId || null,
+    });
+    setTopbarEditView(viewId);
+  };
+
   // Handle click a new view tab.
   const handleClickNewView = () => {
     setTopbarEditView(null);
     history.push('/custom_views/estimates/new');
   };
-
+  
   return (
     <Navbar className={'navbar--dashboard-views'}>
       <NavbarGroup align={Alignment.LEFT}>
         <DashboardViewsTabs
           initialViewId={customViewId}
-          baseUrl={'/estimates'}
+          resourceName={'estimates'}
           tabs={tabs}
-          onNewViewTabClick={handleClickNewView}
           onChange={handleTabsChange}
         />
       </NavbarGroup>
diff --git a/client/src/containers/Sales/Estimate/withEstimates.js b/client/src/containers/Sales/Estimate/withEstimates.js
index 589e4a032..36be9d88c 100644
--- a/client/src/containers/Sales/Estimate/withEstimates.js
+++ b/client/src/containers/Sales/Estimate/withEstimates.js
@@ -20,7 +20,7 @@ export default (mapState) => {
       estimatesCurrentPage: getEstimatesItems(state, props, query),
       estimatesCurrentViewId: getEstimatesCurrentViewId(state, props),
 
-      estimateViews: getResourceViews(state, props, 'sales_estimates'),
+      estimateViews: getResourceViews(state, props, 'sale_estimate'),
       estimateItems: state.salesEstimates.items,
       
       estimatesTableQuery: query,
diff --git a/client/src/store/Estimate/estimates.actions.js b/client/src/store/Estimate/estimates.actions.js
index b6632dc65..7e7f58963 100644
--- a/client/src/store/Estimate/estimates.actions.js
+++ b/client/src/store/Estimate/estimates.actions.js
@@ -92,7 +92,8 @@ export const fetchEstimatesTable = ({ query = {} }) => {
             payload: {
               sales_estimates: response.data.sales_estimates,
               pagination: response.data.pagination,
-              customViewId: response.data.customViewId || -1,
+              customViewId:
+                response.data?.filter_meta?.view?.custom_view_id || -1,
             },
           });
           dispatch({
@@ -105,7 +106,8 @@ export const fetchEstimatesTable = ({ query = {} }) => {
             type: t.ESTIMATES_PAGINATION_SET,
             payload: {
               pagination: response.data.pagination,
-              customViewId: response.data.customViewId || -1,
+              customViewId:
+                response.data?.filter_meta?.view?.custom_view_id || -1,
             },
           });
           dispatch({