diff --git a/src/containers/Preferences/Branches/components.js b/src/containers/Preferences/Branches/components.js
index defa408d6..142becf56 100644
--- a/src/containers/Preferences/Branches/components.js
+++ b/src/containers/Preferences/Branches/components.js
@@ -3,7 +3,7 @@ import intl from 'react-intl-universal';
 import { Intent, Menu, MenuDivider, MenuItem } from '@blueprintjs/core';
 
 import { safeCallback } from 'utils';
-import { Icon } from 'components';
+import { Icon, If } from 'components';
 
 /**
  * Context menu of Branches.
@@ -19,11 +19,13 @@ export function ActionsMenu({
         text={intl.get('branches.action.edit_branch')}
         onClick={safeCallback(onEdit, original)}
       />
-      <MenuItem
-        icon={<Icon icon="check" />}
-        text={intl.get('branches.action.mark_as_primary')}
-        onClick={safeCallback(onMarkPrimary, original)}
-      />
+      <If condition={!original.primary}>
+        <MenuItem
+          icon={<Icon icon={'check'} iconSize={18} />}
+          text={intl.get('branches.action.mark_as_primary')}
+          onClick={safeCallback(onMarkPrimary, original)}
+        />
+      </If>
       <MenuDivider />
       <MenuItem
         icon={<Icon icon="trash-16" iconSize={16} />}
diff --git a/src/containers/Preferences/Warehouses/WarehousesGridItems.js b/src/containers/Preferences/Warehouses/WarehousesGridItems.js
index d6e9a1b6b..432281521 100644
--- a/src/containers/Preferences/Warehouses/WarehousesGridItems.js
+++ b/src/containers/Preferences/Warehouses/WarehousesGridItems.js
@@ -48,6 +48,7 @@ function WarehouseGridItem({
     <ContextMenu2
       content={
         <WarehouseContextMenu
+          warehouse={warehouse}
           onEditClick={handleEditWarehouse}
           onDeleteClick={handleDeleteWarehouse}
           onMarkPrimary={handleMarkWarehouseAsPrimary}
diff --git a/src/containers/Preferences/Warehouses/components.js b/src/containers/Preferences/Warehouses/components.js
index 42492262d..d598dd377 100644
--- a/src/containers/Preferences/Warehouses/components.js
+++ b/src/containers/Preferences/Warehouses/components.js
@@ -9,7 +9,7 @@ import {
   Classes,
 } from '@blueprintjs/core';
 
-import { Icon } from '../../../components';
+import { Icon, If } from '../../../components';
 import { safeCallback } from 'utils';
 
 const WAREHOUSES_SKELETON_N = 4;
@@ -22,6 +22,7 @@ export function WarehouseContextMenu({
   onEditClick,
   onDeleteClick,
   onMarkPrimary,
+  warehouse,
 }) {
   return (
     <Menu>
@@ -30,11 +31,13 @@ export function WarehouseContextMenu({
         text={intl.get('warehouses.action.edit_warehouse')}
         onClick={safeCallback(onEditClick)}
       />
-      <MenuItem
-        icon={<Icon icon="check" />}
-        text={intl.get('warehouses.action.make_as_parimary')}
-        onClick={safeCallback(onMarkPrimary)}
-      />
+      <If condition={!warehouse.primary}>
+        <MenuItem
+          icon={<Icon icon={'check'} iconSize={18} />}
+          text={intl.get('warehouses.action.make_as_parimary')}
+          onClick={safeCallback(onMarkPrimary)}
+        />
+      </If>
       <MenuDivider />
       <MenuItem
         text={intl.get('warehouses.action.delete_warehouse')}
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/components.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/components.js
index ed40920e2..b7889d74d 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/components.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/components.js
@@ -41,7 +41,7 @@ export function ActionsMenu({
 
       <If condition={!original.is_transferred && !original.is_initiated}>
         <MenuItem
-          icon={<Icon icon="check" iconSize={16} />}
+          icon={<Icon icon={'check'} iconSize={18} />}
           text={intl.get('warehouse_transfer.action.initiate_transfer')}
           onClick={safeCallback(onInitate, original)}
         />