diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
index fcfbd1404..c0c980f6e 100644
--- a/locale/defaultMessages.json
+++ b/locale/defaultMessages.json
@@ -6731,6 +6731,10 @@
     "context": "max price in channel",
     "string": "Max. value"
   },
+  "src_dot_shipping_dot_components_dot_OrderValue_dot_1064401942": {
+    "context": "price rates info",
+    "string": "This rate will apply to all orders"
+  },
   "src_dot_shipping_dot_components_dot_OrderValue_dot_1449127001": {
     "string": "Min Value"
   },
@@ -6742,9 +6746,9 @@
     "context": "card title",
     "string": "Order Value"
   },
-  "src_dot_shipping_dot_components_dot_OrderValue_dot_4226393146": {
-    "context": "price rates info",
-    "string": "This rate will apply to all orders of all prices"
+  "src_dot_shipping_dot_components_dot_OrderValue_dot_491724403": {
+    "context": "checkbox label",
+    "string": "Restrict order value"
   },
   "src_dot_shipping_dot_components_dot_OrderValue_dot_507892781": {
     "context": "channel name",
@@ -6757,14 +6761,14 @@
     "context": "min price in channel",
     "string": "Min. value"
   },
-  "src_dot_shipping_dot_components_dot_OrderValue_dot_882649212": {
-    "context": "checkbox label",
-    "string": "There are no value limits"
-  },
   "src_dot_shipping_dot_components_dot_OrderWeight_dot_1064401942": {
     "context": "info text",
     "string": "This rate will apply to all orders"
   },
+  "src_dot_shipping_dot_components_dot_OrderWeight_dot_1648082334": {
+    "context": "checkbox label",
+    "string": "Restrict order weight"
+  },
   "src_dot_shipping_dot_components_dot_OrderWeight_dot_2211490913": {
     "context": "card title",
     "string": "Order Weight"
@@ -6772,10 +6776,6 @@
   "src_dot_shipping_dot_components_dot_OrderWeight_dot_2935375344": {
     "string": "Min. Order Weight"
   },
-  "src_dot_shipping_dot_components_dot_OrderWeight_dot_882649212": {
-    "context": "checkbox label",
-    "string": "There are no value limits"
-  },
   "src_dot_shipping_dot_components_dot_OrderWeight_dot_959089677": {
     "string": "Max. Order Weight"
   },
diff --git a/src/shipping/components/OrderValue/OrderValue.stories.tsx b/src/shipping/components/OrderValue/OrderValue.stories.tsx
index 8c176384f..6d06ec13e 100644
--- a/src/shipping/components/OrderValue/OrderValue.stories.tsx
+++ b/src/shipping/components/OrderValue/OrderValue.stories.tsx
@@ -12,7 +12,7 @@ const props: OrderValueProps = {
   ),
   disabled: false,
   errors: [],
-  noLimits: false,
+  orderValueRestricted: true,
   onChange: () => undefined,
   onChannelsChange: () => undefined
 };
diff --git a/src/shipping/components/OrderValue/OrderValue.tsx b/src/shipping/components/OrderValue/OrderValue.tsx
index 670f241d8..adaba7cbf 100644
--- a/src/shipping/components/OrderValue/OrderValue.tsx
+++ b/src/shipping/components/OrderValue/OrderValue.tsx
@@ -1,11 +1,11 @@
 import {
   Card,
-  CardContent,
   TableBody,
   TableCell,
   TableRow,
   Typography
 } from "@material-ui/core";
+import VerticalSpacer from "@saleor/apps/components/VerticalSpacer";
 import { ChannelShippingData } from "@saleor/channels/utils";
 import CardTitle from "@saleor/components/CardTitle";
 import ControlledCheckbox from "@saleor/components/ControlledCheckbox";
@@ -32,7 +32,7 @@ export interface OrderValueProps {
   channels: ChannelShippingData[];
   errors: ShippingChannelsErrorFragment[];
   disabled: boolean;
-  noLimits: boolean;
+  orderValueRestricted: boolean;
   onChange: (event: ChangeEvent) => void;
   onChannelsChange: (channelId: string, value: Value) => void;
 }
@@ -42,7 +42,7 @@ const numberOfColumns = 3;
 export const OrderValue: React.FC<OrderValueProps> = ({
   channels,
   errors,
-  noLimits,
+  orderValueRestricted,
   disabled,
   onChannelsChange,
   onChange
@@ -62,37 +62,36 @@ export const OrderValue: React.FC<OrderValueProps> = ({
           description: "card title"
         })}
       />
-      <CardContent className={classes.content}>
+      <div className={classes.content}>
         <div className={classes.subheader}>
           <ControlledCheckbox
-            name="noLimits"
+            name="orderValueRestricted"
             label={
               <>
                 <FormattedMessage
-                  defaultMessage="There are no value limits"
+                  defaultMessage="Restrict order value"
                   description="checkbox label"
                 />
-                <Typography variant="caption" className={classes.caption}>
+                <Typography variant="caption">
                   {intl.formatMessage({
-                    defaultMessage:
-                      "This rate will apply to all orders of all prices",
+                    defaultMessage: "This rate will apply to all orders",
                     description: "price rates info"
                   })}
                 </Typography>
               </>
             }
-            checked={noLimits}
+            checked={orderValueRestricted}
             onChange={onChange}
             disabled={disabled}
           />
-          <Typography variant="caption" className={classes.info}>
-            <FormattedMessage
-              defaultMessage="Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency"
-              description="channels discount info"
-            />
-          </Typography>
+          <VerticalSpacer />
+          <FormattedMessage
+            defaultMessage="Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency"
+            description="channels discount info"
+          />
+          <VerticalSpacer />
         </div>
-        {!noLimits && (
+        {orderValueRestricted && (
           <ResponsiveTable className={classes.table}>
             <TableHead colSpan={numberOfColumns} disabled={disabled} items={[]}>
               <TableCell className={classes.colName}>
@@ -185,7 +184,7 @@ export const OrderValue: React.FC<OrderValueProps> = ({
             </TableBody>
           </ResponsiveTable>
         )}
-      </CardContent>
+      </div>
     </Card>
   );
 };
diff --git a/src/shipping/components/OrderValue/styles.ts b/src/shipping/components/OrderValue/styles.ts
index f6aba2f4c..85b77460a 100644
--- a/src/shipping/components/OrderValue/styles.ts
+++ b/src/shipping/components/OrderValue/styles.ts
@@ -2,9 +2,6 @@ import { makeStyles } from "@saleor/macaw-ui";
 
 export const useStyles = makeStyles(
   theme => ({
-    caption: {
-      marginBottom: theme.spacing(2)
-    },
     colName: {
       fontSize: 14,
       paddingLeft: 0,
@@ -16,11 +13,7 @@ export const useStyles = makeStyles(
       width: 200
     },
     content: {
-      "&:last-child": {
-        paddingBottom: 0
-      },
-      paddingLeft: 0,
-      paddingRight: 0
+      padding: theme.spacing(3, 0, 3, 0)
     },
     info: {
       fontSize: 14
@@ -29,7 +22,7 @@ export const useStyles = makeStyles(
       verticalAlign: "top"
     },
     subheader: {
-      padding: theme.spacing(0, 3, 2, 3)
+      padding: theme.spacing(0, 3, 0, 3)
     },
     table: {
       tableLayout: "fixed"
diff --git a/src/shipping/components/OrderWeight/OrderWeight.stories.tsx b/src/shipping/components/OrderWeight/OrderWeight.stories.tsx
index 4025f22aa..66f4ed9e1 100644
--- a/src/shipping/components/OrderWeight/OrderWeight.stories.tsx
+++ b/src/shipping/components/OrderWeight/OrderWeight.stories.tsx
@@ -10,7 +10,7 @@ const props: OrderWeightProps = {
   errors: [],
   maxValue: "2",
   minValue: "1",
-  noLimits: false,
+  orderValueRestricted: true,
   onChange: () => undefined
 };
 
diff --git a/src/shipping/components/OrderWeight/OrderWeight.tsx b/src/shipping/components/OrderWeight/OrderWeight.tsx
index bad24c7dd..4d90c6cb7 100644
--- a/src/shipping/components/OrderWeight/OrderWeight.tsx
+++ b/src/shipping/components/OrderWeight/OrderWeight.tsx
@@ -1,8 +1,16 @@
-import { Card, CardContent, TextField, Typography } from "@material-ui/core";
+import {
+  Card,
+  CardContent,
+  InputAdornment,
+  TextField,
+  Typography
+} from "@material-ui/core";
+import VerticalSpacer from "@saleor/apps/components/VerticalSpacer";
 import CardTitle from "@saleor/components/CardTitle";
 import ControlledCheckbox from "@saleor/components/ControlledCheckbox";
 import { ShippingErrorFragment } from "@saleor/fragments/types/ShippingErrorFragment";
 import { ChangeEvent } from "@saleor/hooks/useForm";
+import useShop from "@saleor/hooks/useShop";
 import { getShippingWeightRateErrorMessage } from "@saleor/shipping/errors";
 import { getFormErrors } from "@saleor/utils/errors";
 import React from "react";
@@ -13,14 +21,14 @@ import { useStyles } from "./styles";
 export interface OrderWeightProps {
   disabled: boolean;
   errors: ShippingErrorFragment[];
-  noLimits: boolean;
+  orderValueRestricted: boolean;
   maxValue: string;
   minValue: string;
   onChange: (event: ChangeEvent) => void;
 }
 
 export const OrderWeight: React.FC<OrderWeightProps> = ({
-  noLimits,
+  orderValueRestricted,
   disabled,
   errors,
   maxValue = "",
@@ -29,6 +37,7 @@ export const OrderWeight: React.FC<OrderWeightProps> = ({
 }) => {
   const classes = useStyles({});
   const intl = useIntl();
+  const shop = useShop();
 
   const formFields = ["minimumOrderWeight", "maximumOrderWeight"];
   const formErrors = getFormErrors(formFields, errors);
@@ -43,14 +52,14 @@ export const OrderWeight: React.FC<OrderWeightProps> = ({
       />
       <CardContent>
         <ControlledCheckbox
-          name="noLimits"
+          name="orderValueRestricted"
           label={
             <>
               <FormattedMessage
-                defaultMessage="There are no value limits"
+                defaultMessage="Restrict order weight"
                 description="checkbox label"
               />
-              <Typography variant="caption" className={classes.caption}>
+              <Typography variant="caption">
                 <FormattedMessage
                   defaultMessage="This rate will apply to all orders"
                   description="info text"
@@ -58,52 +67,68 @@ export const OrderWeight: React.FC<OrderWeightProps> = ({
               </Typography>
             </>
           }
-          checked={noLimits}
+          checked={orderValueRestricted}
           onChange={onChange}
           disabled={disabled}
         />
-
-        {!noLimits && (
-          <div className={classes.grid}>
-            <TextField
-              disabled={disabled}
-              helperText={getShippingWeightRateErrorMessage(
-                formErrors.minimumOrderWeight,
-                intl
-              )}
-              error={!!formErrors.minimumOrderWeight}
-              fullWidth
-              label={intl.formatMessage({
-                defaultMessage: "Min. Order Weight"
-              })}
-              name="minValue"
-              type="number"
-              inputProps={{
-                min: 0,
-                type: "number"
-              }}
-              InputProps={{ inputProps: { min: 0 } }}
-              value={minValue}
-              onChange={onChange}
-            />
-            <TextField
-              disabled={disabled}
-              helperText={getShippingWeightRateErrorMessage(
-                formErrors.maximumOrderWeight,
-                intl
-              )}
-              error={!!formErrors.maximumOrderWeight}
-              fullWidth
-              label={intl.formatMessage({
-                defaultMessage: "Max. Order Weight"
-              })}
-              name="maxValue"
-              type="number"
-              InputProps={{ inputProps: { min: minValue } }}
-              value={maxValue}
-              onChange={onChange}
-            />
-          </div>
+        {orderValueRestricted && (
+          <>
+            <VerticalSpacer spacing={2} />
+            <div className={classes.grid}>
+              <TextField
+                disabled={disabled}
+                helperText={getShippingWeightRateErrorMessage(
+                  formErrors.minimumOrderWeight,
+                  intl
+                )}
+                error={!!formErrors.minimumOrderWeight}
+                fullWidth
+                label={intl.formatMessage({
+                  defaultMessage: "Min. Order Weight"
+                })}
+                name="minValue"
+                type="number"
+                inputProps={{
+                  min: 0,
+                  type: "number"
+                }}
+                InputProps={{
+                  inputProps: { min: 0 },
+                  endAdornment: (
+                    <InputAdornment position="end">
+                      <Typography>{shop?.defaultWeightUnit}</Typography>
+                    </InputAdornment>
+                  )
+                }}
+                value={minValue}
+                onChange={onChange}
+              />
+              <TextField
+                disabled={disabled}
+                helperText={getShippingWeightRateErrorMessage(
+                  formErrors.maximumOrderWeight,
+                  intl
+                )}
+                error={!!formErrors.maximumOrderWeight}
+                fullWidth
+                label={intl.formatMessage({
+                  defaultMessage: "Max. Order Weight"
+                })}
+                name="maxValue"
+                type="number"
+                InputProps={{
+                  inputProps: { min: minValue },
+                  endAdornment: (
+                    <InputAdornment position="end">
+                      <Typography>{shop?.defaultWeightUnit}</Typography>
+                    </InputAdornment>
+                  )
+                }}
+                value={maxValue}
+                onChange={onChange}
+              />
+            </div>
+          </>
         )}
       </CardContent>
     </Card>
diff --git a/src/shipping/components/OrderWeight/styles.ts b/src/shipping/components/OrderWeight/styles.ts
index 7c0128004..cd920ef7b 100644
--- a/src/shipping/components/OrderWeight/styles.ts
+++ b/src/shipping/components/OrderWeight/styles.ts
@@ -2,9 +2,6 @@ import { makeStyles } from "@saleor/macaw-ui";
 
 export const useStyles = makeStyles(
   theme => ({
-    caption: {
-      marginBottom: theme.spacing(2)
-    },
     grid: {
       display: "grid",
       gridColumnGap: theme.spacing(2),
diff --git a/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx b/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx
index fb05c6caf..666d6aa5d 100644
--- a/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx
+++ b/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx
@@ -27,18 +27,7 @@ import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
 import ShippingZonePostalCodes from "../ShippingZonePostalCodes";
-
-export interface FormData {
-  channelListings: ChannelShippingData[];
-  name: string;
-  description: OutputData;
-  noLimits: boolean;
-  minValue: string;
-  maxValue: string;
-  minDays: string;
-  maxDays: string;
-  type: ShippingMethodTypeEnum;
-}
+import { ShippingZoneRateCommonFormData } from "../ShippingZoneRatesPage/types";
 
 export interface ShippingZoneRatesCreatePageProps {
   allChannelsCount?: number;
@@ -51,7 +40,7 @@ export interface ShippingZoneRatesCreatePageProps {
   saveButtonBarState: ConfirmButtonTransitionState;
   onBack: () => void;
   onDelete?: () => void;
-  onSubmit: (data: FormData) => void;
+  onSubmit: (data: ShippingZoneRateCommonFormData) => void;
   onPostalCodeInclusionChange: (
     inclusion: PostalCodeRuleInclusionTypeEnum
   ) => void;
@@ -83,7 +72,7 @@ export const ShippingZoneRatesCreatePage: React.FC<ShippingZoneRatesCreatePagePr
 }) => {
   const intl = useIntl();
   const isPriceVariant = variant === ShippingMethodTypeEnum.PRICE;
-  const initialForm: FormData = {
+  const initialForm: ShippingZoneRateCommonFormData = {
     channelListings: shippingChannels,
     maxDays: "",
     maxValue: "",
@@ -91,7 +80,7 @@ export const ShippingZoneRatesCreatePage: React.FC<ShippingZoneRatesCreatePagePr
     minValue: "",
     name: "",
     description: null,
-    noLimits: false,
+    orderValueRestricted: true,
     type: null
   };
 
@@ -143,14 +132,14 @@ export const ShippingZoneRatesCreatePage: React.FC<ShippingZoneRatesCreatePagePr
                   <OrderValue
                     channels={data.channelListings}
                     errors={channelErrors}
-                    noLimits={data.noLimits}
+                    orderValueRestricted={data.orderValueRestricted}
                     disabled={disabled}
                     onChange={change}
                     onChannelsChange={handleChannelsChange}
                   />
                 ) : (
                   <OrderWeight
-                    noLimits={data.noLimits}
+                    orderValueRestricted={data.orderValueRestricted}
                     disabled={disabled}
                     minValue={data.minValue}
                     maxValue={data.maxValue}
diff --git a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx
index 3b5564d6b..b2492757f 100644
--- a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx
+++ b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx
@@ -7,7 +7,6 @@ import Container from "@saleor/components/Container";
 import Form from "@saleor/components/Form";
 import Grid from "@saleor/components/Grid";
 import Metadata from "@saleor/components/Metadata/Metadata";
-import { MetadataFormData } from "@saleor/components/Metadata/types";
 import PageHeader from "@saleor/components/PageHeader";
 import Savebar from "@saleor/components/Savebar";
 import { ShippingChannelsErrorFragment } from "@saleor/fragments/types/ShippingChannelsErrorFragment";
@@ -37,18 +36,7 @@ import React from "react";
 import { FormattedMessage } from "react-intl";
 
 import ShippingZonePostalCodes from "../ShippingZonePostalCodes";
-
-export interface FormData extends MetadataFormData {
-  channelListings: ChannelShippingData[];
-  name: string;
-  description: OutputData;
-  noLimits: boolean;
-  minValue: string;
-  maxValue: string;
-  minDays: string;
-  maxDays: string;
-  type: ShippingMethodTypeEnum;
-}
+import { ShippingZoneRateUpdateFormData } from "./types";
 
 export interface ShippingZoneRatesPageProps
   extends Pick<ListProps, Exclude<keyof ListProps, "onRowClick">>,
@@ -65,7 +53,7 @@ export interface ShippingZoneRatesPageProps
   postalCodeRules: ShippingZone_shippingZone_shippingMethods_postalCodeRules[];
   onBack: () => void;
   onDelete?: () => void;
-  onSubmit: (data: FormData) => void;
+  onSubmit: (data: ShippingZoneRateUpdateFormData) => void;
   onPostalCodeInclusionChange: (
     inclusion: PostalCodeRuleInclusionTypeEnum
   ) => void;
@@ -103,7 +91,8 @@ export const ShippingZoneRatesPage: React.FC<ShippingZoneRatesPageProps> = ({
   ...listProps
 }) => {
   const isPriceVariant = variant === ShippingMethodTypeEnum.PRICE;
-  const initialForm: FormData = {
+
+  const initialForm: ShippingZoneRateUpdateFormData = {
     channelListings: shippingChannels,
     maxDays: rate?.maximumDeliveryDays?.toString() || "",
     maxValue: rate?.maximumOrderWeight?.value.toString() || "",
@@ -112,7 +101,7 @@ export const ShippingZoneRatesPage: React.FC<ShippingZoneRatesPageProps> = ({
     minValue: rate?.minimumOrderWeight?.value.toString() || "",
     name: rate?.name || "",
     description: rate?.description && JSON.parse(rate.description),
-    noLimits: false,
+    orderValueRestricted: !!rate?.channelListings.length,
     privateMetadata: rate?.privateMetadata.map(mapMetadataItemToInput),
     type: rate?.type || null
   };
@@ -161,14 +150,14 @@ export const ShippingZoneRatesPage: React.FC<ShippingZoneRatesPageProps> = ({
                   <OrderValue
                     channels={data.channelListings}
                     errors={channelErrors}
-                    noLimits={data.noLimits}
+                    orderValueRestricted={data.orderValueRestricted}
                     disabled={disabled}
                     onChange={change}
                     onChannelsChange={handleChannelsChange}
                   />
                 ) : (
                   <OrderWeight
-                    noLimits={data.noLimits}
+                    orderValueRestricted={data.orderValueRestricted}
                     disabled={disabled}
                     minValue={data.minValue}
                     maxValue={data.maxValue}
diff --git a/src/shipping/components/ShippingZoneRatesPage/types.ts b/src/shipping/components/ShippingZoneRatesPage/types.ts
new file mode 100644
index 000000000..8e032f39e
--- /dev/null
+++ b/src/shipping/components/ShippingZoneRatesPage/types.ts
@@ -0,0 +1,19 @@
+import { OutputData } from "@editorjs/editorjs";
+import { ChannelShippingData } from "@saleor/channels/utils";
+import { MetadataFormData } from "@saleor/components/Metadata";
+import { ShippingMethodTypeEnum } from "@saleor/types/globalTypes";
+
+export interface ShippingZoneRateCommonFormData {
+  channelListings: ChannelShippingData[];
+  name: string;
+  description: OutputData;
+  orderValueRestricted: boolean;
+  minValue: string;
+  maxValue: string;
+  minDays: string;
+  maxDays: string;
+  type: ShippingMethodTypeEnum;
+}
+
+export type ShippingZoneRateUpdateFormData = ShippingZoneRateCommonFormData &
+  MetadataFormData;
diff --git a/src/shipping/handlers.ts b/src/shipping/handlers.ts
index 1a3ee4f02..ee0f93138 100644
--- a/src/shipping/handlers.ts
+++ b/src/shipping/handlers.ts
@@ -4,7 +4,6 @@ import useNavigator from "@saleor/hooks/useNavigator";
 import useNotifier from "@saleor/hooks/useNotifier";
 import { commonMessages } from "@saleor/intl";
 import { getMutationErrors, getMutationState } from "@saleor/misc";
-import { FormData as ShippingZoneRatesPageFormData } from "@saleor/shipping/components/ShippingZoneRatesPage";
 import { CreateShippingRateVariables } from "@saleor/shipping/types/CreateShippingRate";
 import { ShippingMethodChannelListingUpdateVariables } from "@saleor/shipping/types/ShippingMethodChannelListingUpdate";
 import { UpdateShippingRateVariables } from "@saleor/shipping/types/UpdateShippingRate";
@@ -17,6 +16,7 @@ import { getParsedDataForJsonStringField } from "@saleor/utils/richText/misc";
 import differenceBy from "lodash/differenceBy";
 import { useIntl } from "react-intl";
 
+import { ShippingZoneRateCommonFormData } from "./components/ShippingZoneRatesPage/types";
 import {
   useShippingMethodChannelListingUpdate,
   useShippingRateCreate,
@@ -61,7 +61,7 @@ const getPostalCodeRulesToAdd = (
     );
 
 export function getCreateShippingPriceRateVariables(
-  data: ShippingZoneRatesPageFormData,
+  data: ShippingZoneRateCommonFormData,
   id: string,
   addPostalCodeRules: ShippingMethodFragment_postalCodeRules[],
   inclusionType: PostalCodeRuleInclusionTypeEnum
@@ -84,7 +84,7 @@ export function getCreateShippingPriceRateVariables(
 }
 
 export function getCreateShippingWeightRateVariables(
-  data: ShippingZoneRatesPageFormData,
+  data: ShippingZoneRateCommonFormData,
   id: string,
   addPostalCodeRules: ShippingMethodFragment_postalCodeRules[],
   inclusionType: PostalCodeRuleInclusionTypeEnum
@@ -93,7 +93,7 @@ export function getCreateShippingWeightRateVariables(
   const parsedMaxValue = parseFloat(data.maxValue);
   const parsedMinDays = parseInt(data.minDays, 10);
   const parsedMaxDays = parseInt(data.maxDays, 10);
-  const isWeightSet = !data.noLimits;
+  const isWeightSet = data.orderValueRestricted;
   const postalCodeRules = getPostalCodeRulesToAdd(addPostalCodeRules);
   return {
     input: {
@@ -112,7 +112,7 @@ export function getCreateShippingWeightRateVariables(
 }
 
 export function getUpdateShippingPriceRateVariables(
-  data: ShippingZoneRatesPageFormData,
+  data: ShippingZoneRateCommonFormData,
   id: string,
   rateId: string,
   addPostalCodeRules: ShippingMethodFragment_postalCodeRules[],
@@ -140,7 +140,7 @@ export function getUpdateShippingPriceRateVariables(
 }
 
 export function getUpdateShippingWeightRateVariables(
-  data: ShippingZoneRatesPageFormData,
+  data: ShippingZoneRateCommonFormData,
   id: string,
   rateId: string,
   addPostalCodeRules: ShippingMethodFragment_postalCodeRules[],
@@ -150,7 +150,7 @@ export function getUpdateShippingWeightRateVariables(
   const parsedMaxValue = parseFloat(data.maxValue);
   const parsedMinDays = parseInt(data.minDays, 10);
   const parsedMaxDays = parseInt(data.maxDays, 10);
-  const isWeightSet = !data.noLimits;
+  const isWeightSet = data.orderValueRestricted;
   const postalCodeRules = getPostalCodeRulesToAdd(addPostalCodeRules);
   return {
     id: rateId,
@@ -173,7 +173,7 @@ export function getUpdateShippingWeightRateVariables(
 }
 export function getShippingMethodChannelVariables(
   id: string,
-  noLimits: boolean,
+  orderValueRestricted: boolean,
   formChannels: ChannelShippingData[],
   prevChannels?: ChannelShippingData[]
 ): ShippingMethodChannelListingUpdateVariables {
@@ -188,9 +188,9 @@ export function getShippingMethodChannelVariables(
         formChannels?.map(channel => ({
           channelId: channel.id,
           maximumOrderPrice:
-            channel.maxValue && !noLimits ? channel.maxValue : null,
+            channel.maxValue && orderValueRestricted ? channel.maxValue : null,
           minimumOrderPrice:
-            channel.minValue && !noLimits ? channel.minValue : null,
+            channel.minValue && orderValueRestricted ? channel.minValue : null,
           price: channel.price || null
         })) || [],
       removeChannels
@@ -226,7 +226,7 @@ export function useShippingRateCreator(
       ? shippingPriceRatesEditUrl
       : shippingWeightRatesEditUrl;
 
-  const createShippingRate = async (data: ShippingZoneRatesPageFormData) => {
+  const createShippingRate = async (data: ShippingZoneRateCommonFormData) => {
     const response = await createBaseShippingRate({
       variables: getVariables(data, shippingZoneId, postalCodes, inclusionType)
     });
@@ -239,7 +239,7 @@ export function useShippingRateCreator(
         updateShippingMethodChannelListing({
           variables: getShippingMethodChannelVariables(
             rateId,
-            data.noLimits,
+            data.orderValueRestricted,
             data.channelListings
           )
         })
diff --git a/src/shipping/views/PriceRatesUpdate/PriceRatesUpdate.tsx b/src/shipping/views/PriceRatesUpdate/PriceRatesUpdate.tsx
index 50b65825c..821c86c81 100644
--- a/src/shipping/views/PriceRatesUpdate/PriceRatesUpdate.tsx
+++ b/src/shipping/views/PriceRatesUpdate/PriceRatesUpdate.tsx
@@ -24,9 +24,8 @@ import useProductSearch from "@saleor/searches/useProductSearch";
 import DeleteShippingRateDialog from "@saleor/shipping/components/DeleteShippingRateDialog";
 import ShippingMethodProductsAddDialog from "@saleor/shipping/components/ShippingMethodProductsAddDialog";
 import ShippingZonePostalCodeRangeDialog from "@saleor/shipping/components/ShippingZonePostalCodeRangeDialog";
-import ShippingZoneRatesPage, {
-  FormData
-} from "@saleor/shipping/components/ShippingZoneRatesPage";
+import ShippingZoneRatesPage from "@saleor/shipping/components/ShippingZoneRatesPage";
+import { ShippingZoneRateUpdateFormData } from "@saleor/shipping/components/ShippingZoneRatesPage/types";
 import UnassignDialog from "@saleor/shipping/components/UnassignDialog";
 import {
   getShippingMethodChannelVariables,
@@ -211,7 +210,9 @@ export const PriceRatesUpdate: React.FC<PriceRatesUpdateProps> = ({
     });
   };
 
-  const updateData = async (formData: FormData): Promise<unknown[]> => {
+  const updateData = async (
+    formData: ShippingZoneRateUpdateFormData
+  ): Promise<unknown[]> => {
     const response = await updateShippingRate({
       variables: getUpdateShippingPriceRateVariables(
         formData,
@@ -229,7 +230,7 @@ export const PriceRatesUpdate: React.FC<PriceRatesUpdateProps> = ({
       updateShippingMethodChannelListing({
         variables: getShippingMethodChannelVariables(
           rateId,
-          formData.noLimits,
+          formData.orderValueRestricted,
           formData.channelListings,
           shippingChannels
         )
diff --git a/src/shipping/views/WeightRatesUpdate/WeightRatesUpdate.tsx b/src/shipping/views/WeightRatesUpdate/WeightRatesUpdate.tsx
index 5fd087ae9..3bff002e9 100644
--- a/src/shipping/views/WeightRatesUpdate/WeightRatesUpdate.tsx
+++ b/src/shipping/views/WeightRatesUpdate/WeightRatesUpdate.tsx
@@ -24,9 +24,8 @@ import useProductSearch from "@saleor/searches/useProductSearch";
 import DeleteShippingRateDialog from "@saleor/shipping/components/DeleteShippingRateDialog";
 import ShippingMethodProductsAddDialog from "@saleor/shipping/components/ShippingMethodProductsAddDialog";
 import ShippingZonePostalCodeRangeDialog from "@saleor/shipping/components/ShippingZonePostalCodeRangeDialog";
-import ShippingZoneRatesPage, {
-  FormData
-} from "@saleor/shipping/components/ShippingZoneRatesPage";
+import ShippingZoneRatesPage from "@saleor/shipping/components/ShippingZoneRatesPage";
+import { ShippingZoneRateUpdateFormData } from "@saleor/shipping/components/ShippingZoneRatesPage/types";
 import UnassignDialog from "@saleor/shipping/components/UnassignDialog";
 import {
   getShippingMethodChannelVariables,
@@ -233,7 +232,7 @@ export const WeightRatesUpdate: React.FC<WeightRatesUpdateProps> = ({
   const [updateMetadata] = useMetadataUpdate({});
   const [updatePrivateMetadata] = usePrivateMetadataUpdate({});
 
-  const updateData = async (data: FormData) => {
+  const updateData = async (data: ShippingZoneRateUpdateFormData) => {
     const response = await updateShippingRate({
       variables: getUpdateShippingWeightRateVariables(
         data,
@@ -250,7 +249,7 @@ export const WeightRatesUpdate: React.FC<WeightRatesUpdateProps> = ({
       updateShippingMethodChannelListing({
         variables: getShippingMethodChannelVariables(
           rateId,
-          data.noLimits,
+          data.orderValueRestricted,
           data.channelListings,
           shippingChannels
         )
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index bfc28737b..186251154 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -18388,7 +18388,7 @@ exports[`Storyshots Shipping / Order value rates default 1`] = `
       class="CardTitle-hr-id"
     />
     <div
-      class="MuiCardContent-root-id OrderValue-content-id"
+      class="OrderValue-content-id"
     >
       <div
         class="OrderValue-subheader-id"
@@ -18398,15 +18398,16 @@ exports[`Storyshots Shipping / Order value rates default 1`] = `
         >
           <span
             aria-disabled="false"
-            class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
+            class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
           >
             <span
               class="MuiIconButton-label-id"
             >
               <input
+                checked=""
                 class="PrivateSwitchBase-input-id"
                 data-indeterminate="false"
-                name="noLimits"
+                name="orderValueRestricted"
                 type="checkbox"
               />
               <svg
@@ -18416,7 +18417,7 @@ exports[`Storyshots Shipping / Order value rates default 1`] = `
                 viewBox="0 0 24 24"
               >
                 <path
-                  d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                  d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
                 />
               </svg>
             </span>
@@ -18424,19 +18425,21 @@ exports[`Storyshots Shipping / Order value rates default 1`] = `
           <span
             class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
           >
-            There are no value limits
+            Restrict order value
             <div
-              class="MuiTypography-root-id OrderValue-caption-id MuiTypography-caption-id"
+              class="MuiTypography-root-id MuiTypography-caption-id"
             >
-              This rate will apply to all orders of all prices
+              This rate will apply to all orders
             </div>
           </span>
         </label>
         <div
-          class="MuiTypography-root-id OrderValue-info-id MuiTypography-caption-id"
-        >
-          Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
-        </div>
+          class="VerticalSpacer-container-id VerticalSpacer-container-id"
+        />
+        Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
+        <div
+          class="VerticalSpacer-container-id VerticalSpacer-container-id"
+        />
       </div>
       <div
         class="ResponsiveTable-root-id"
@@ -18620,7 +18623,7 @@ exports[`Storyshots Shipping / Order value rates loading 1`] = `
       class="CardTitle-hr-id"
     />
     <div
-      class="MuiCardContent-root-id OrderValue-content-id"
+      class="OrderValue-content-id"
     >
       <div
         class="OrderValue-subheader-id"
@@ -18630,17 +18633,18 @@ exports[`Storyshots Shipping / Order value rates loading 1`] = `
         >
           <span
             aria-disabled="true"
-            class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+            class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
             tabindex="-1"
           >
             <span
               class="MuiIconButton-label-id"
             >
               <input
+                checked=""
                 class="PrivateSwitchBase-input-id"
                 data-indeterminate="false"
                 disabled=""
-                name="noLimits"
+                name="orderValueRestricted"
                 type="checkbox"
               />
               <svg
@@ -18650,7 +18654,7 @@ exports[`Storyshots Shipping / Order value rates loading 1`] = `
                 viewBox="0 0 24 24"
               >
                 <path
-                  d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                  d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
                 />
               </svg>
             </span>
@@ -18658,19 +18662,21 @@ exports[`Storyshots Shipping / Order value rates loading 1`] = `
           <span
             class="MuiTypography-root-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id MuiTypography-body1-id"
           >
-            There are no value limits
+            Restrict order value
             <div
-              class="MuiTypography-root-id OrderValue-caption-id MuiTypography-caption-id"
+              class="MuiTypography-root-id MuiTypography-caption-id"
             >
-              This rate will apply to all orders of all prices
+              This rate will apply to all orders
             </div>
           </span>
         </label>
         <div
-          class="MuiTypography-root-id OrderValue-info-id MuiTypography-caption-id"
-        >
-          Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
-        </div>
+          class="VerticalSpacer-container-id VerticalSpacer-container-id"
+        />
+        Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
+        <div
+          class="VerticalSpacer-container-id VerticalSpacer-container-id"
+        />
       </div>
       <div
         class="ResponsiveTable-root-id"
@@ -18863,15 +18869,16 @@ exports[`Storyshots Shipping / Order weight rates default 1`] = `
       >
         <span
           aria-disabled="false"
-          class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
+          class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
         >
           <span
             class="MuiIconButton-label-id"
           >
             <input
+              checked=""
               class="PrivateSwitchBase-input-id"
               data-indeterminate="false"
-              name="noLimits"
+              name="orderValueRestricted"
               type="checkbox"
             />
             <svg
@@ -18881,7 +18888,7 @@ exports[`Storyshots Shipping / Order weight rates default 1`] = `
               viewBox="0 0 24 24"
             >
               <path
-                d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
               />
             </svg>
           </span>
@@ -18889,14 +18896,17 @@ exports[`Storyshots Shipping / Order weight rates default 1`] = `
         <span
           class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
         >
-          There are no value limits
+          Restrict order weight
           <div
-            class="MuiTypography-root-id OrderWeight-caption-id MuiTypography-caption-id"
+            class="MuiTypography-root-id MuiTypography-caption-id"
           >
             This rate will apply to all orders
           </div>
         </span>
       </label>
+      <div
+        class="VerticalSpacer-container-id VerticalSpacer-container-id"
+      />
       <div
         class="OrderWeight-grid-id"
       >
@@ -18910,16 +18920,23 @@ exports[`Storyshots Shipping / Order weight rates default 1`] = `
             Min. Order Weight
           </label>
           <div
-            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
           >
             <input
               aria-invalid="false"
-              class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
               min="0"
               name="minValue"
               type="number"
               value="1"
             />
+            <div
+              class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+            >
+              <div
+                class="MuiTypography-root-id MuiTypography-body1-id"
+              />
+            </div>
             <fieldset
               aria-hidden="true"
               class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -18944,16 +18961,23 @@ exports[`Storyshots Shipping / Order weight rates default 1`] = `
             Max. Order Weight
           </label>
           <div
-            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
           >
             <input
               aria-invalid="false"
-              class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
               min="1"
               name="maxValue"
               type="number"
               value="2"
             />
+            <div
+              class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+            >
+              <div
+                class="MuiTypography-root-id MuiTypography-body1-id"
+              />
+            </div>
             <fieldset
               aria-hidden="true"
               class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -19007,15 +19031,16 @@ exports[`Storyshots Shipping / Order weight rates form errors 1`] = `
       >
         <span
           aria-disabled="false"
-          class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
+          class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
         >
           <span
             class="MuiIconButton-label-id"
           >
             <input
+              checked=""
               class="PrivateSwitchBase-input-id"
               data-indeterminate="false"
-              name="noLimits"
+              name="orderValueRestricted"
               type="checkbox"
             />
             <svg
@@ -19025,7 +19050,7 @@ exports[`Storyshots Shipping / Order weight rates form errors 1`] = `
               viewBox="0 0 24 24"
             >
               <path
-                d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
               />
             </svg>
           </span>
@@ -19033,14 +19058,17 @@ exports[`Storyshots Shipping / Order weight rates form errors 1`] = `
         <span
           class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
         >
-          There are no value limits
+          Restrict order weight
           <div
-            class="MuiTypography-root-id OrderWeight-caption-id MuiTypography-caption-id"
+            class="MuiTypography-root-id MuiTypography-caption-id"
           >
             This rate will apply to all orders
           </div>
         </span>
       </label>
+      <div
+        class="VerticalSpacer-container-id VerticalSpacer-container-id"
+      />
       <div
         class="OrderWeight-grid-id"
       >
@@ -19054,16 +19082,23 @@ exports[`Storyshots Shipping / Order weight rates form errors 1`] = `
             Min. Order Weight
           </label>
           <div
-            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
           >
             <input
               aria-invalid="true"
-              class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
               min="0"
               name="minValue"
               type="number"
               value="1"
             />
+            <div
+              class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+            >
+              <div
+                class="MuiTypography-root-id MuiTypography-body1-id"
+              />
+            </div>
             <fieldset
               aria-hidden="true"
               class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -19093,16 +19128,23 @@ exports[`Storyshots Shipping / Order weight rates form errors 1`] = `
             Max. Order Weight
           </label>
           <div
-            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
           >
             <input
               aria-invalid="true"
-              class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
               min="1"
               name="maxValue"
               type="number"
               value="2"
             />
+            <div
+              class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+            >
+              <div
+                class="MuiTypography-root-id MuiTypography-body1-id"
+              />
+            </div>
             <fieldset
               aria-hidden="true"
               class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -19161,17 +19203,18 @@ exports[`Storyshots Shipping / Order weight rates loading 1`] = `
       >
         <span
           aria-disabled="true"
-          class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+          class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
           tabindex="-1"
         >
           <span
             class="MuiIconButton-label-id"
           >
             <input
+              checked=""
               class="PrivateSwitchBase-input-id"
               data-indeterminate="false"
               disabled=""
-              name="noLimits"
+              name="orderValueRestricted"
               type="checkbox"
             />
             <svg
@@ -19181,7 +19224,7 @@ exports[`Storyshots Shipping / Order weight rates loading 1`] = `
               viewBox="0 0 24 24"
             >
               <path
-                d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
               />
             </svg>
           </span>
@@ -19189,14 +19232,17 @@ exports[`Storyshots Shipping / Order weight rates loading 1`] = `
         <span
           class="MuiTypography-root-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id MuiTypography-body1-id"
         >
-          There are no value limits
+          Restrict order weight
           <div
-            class="MuiTypography-root-id OrderWeight-caption-id MuiTypography-caption-id"
+            class="MuiTypography-root-id MuiTypography-caption-id"
           >
             This rate will apply to all orders
           </div>
         </span>
       </label>
+      <div
+        class="VerticalSpacer-container-id VerticalSpacer-container-id"
+      />
       <div
         class="OrderWeight-grid-id"
       >
@@ -19210,17 +19256,24 @@ exports[`Storyshots Shipping / Order weight rates loading 1`] = `
             Min. Order Weight
           </label>
           <div
-            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
           >
             <input
               aria-invalid="false"
-              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
+              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
               disabled=""
               min="0"
               name="minValue"
               type="number"
               value="1"
             />
+            <div
+              class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+            >
+              <div
+                class="MuiTypography-root-id MuiTypography-body1-id"
+              />
+            </div>
             <fieldset
               aria-hidden="true"
               class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -19245,17 +19298,24 @@ exports[`Storyshots Shipping / Order weight rates loading 1`] = `
             Max. Order Weight
           </label>
           <div
-            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
           >
             <input
               aria-invalid="false"
-              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
+              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
               disabled=""
               min="1"
               name="maxValue"
               type="number"
               value="2"
             />
+            <div
+              class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+            >
+              <div
+                class="MuiTypography-root-id MuiTypography-body1-id"
+              />
+            </div>
             <fieldset
               aria-hidden="true"
               class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -19309,15 +19369,16 @@ exports[`Storyshots Shipping / Order weight rates new 1`] = `
       >
         <span
           aria-disabled="false"
-          class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
+          class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
         >
           <span
             class="MuiIconButton-label-id"
           >
             <input
+              checked=""
               class="PrivateSwitchBase-input-id"
               data-indeterminate="false"
-              name="noLimits"
+              name="orderValueRestricted"
               type="checkbox"
             />
             <svg
@@ -19327,7 +19388,7 @@ exports[`Storyshots Shipping / Order weight rates new 1`] = `
               viewBox="0 0 24 24"
             >
               <path
-                d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
               />
             </svg>
           </span>
@@ -19335,14 +19396,17 @@ exports[`Storyshots Shipping / Order weight rates new 1`] = `
         <span
           class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
         >
-          There are no value limits
+          Restrict order weight
           <div
-            class="MuiTypography-root-id OrderWeight-caption-id MuiTypography-caption-id"
+            class="MuiTypography-root-id MuiTypography-caption-id"
           >
             This rate will apply to all orders
           </div>
         </span>
       </label>
+      <div
+        class="VerticalSpacer-container-id VerticalSpacer-container-id"
+      />
       <div
         class="OrderWeight-grid-id"
       >
@@ -19356,16 +19420,23 @@ exports[`Storyshots Shipping / Order weight rates new 1`] = `
             Min. Order Weight
           </label>
           <div
-            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
           >
             <input
               aria-invalid="false"
-              class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
               min="0"
               name="minValue"
               type="number"
               value=""
             />
+            <div
+              class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+            >
+              <div
+                class="MuiTypography-root-id MuiTypography-body1-id"
+              />
+            </div>
             <fieldset
               aria-hidden="true"
               class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -19390,16 +19461,23 @@ exports[`Storyshots Shipping / Order weight rates new 1`] = `
             Max. Order Weight
           </label>
           <div
-            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
           >
             <input
               aria-invalid="false"
-              class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
               min=""
               name="maxValue"
               type="number"
               value=""
             />
+            <div
+              class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+            >
+              <div
+                class="MuiTypography-root-id MuiTypography-body1-id"
+              />
+            </div>
             <fieldset
               aria-hidden="true"
               class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -20187,7 +20265,7 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page create price 1`]
               class="CardTitle-hr-id"
             />
             <div
-              class="MuiCardContent-root-id OrderValue-content-id"
+              class="OrderValue-content-id"
             >
               <div
                 class="OrderValue-subheader-id"
@@ -20197,15 +20275,16 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page create price 1`]
                 >
                   <span
                     aria-disabled="false"
-                    class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
+                    class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
                   >
                     <span
                       class="MuiIconButton-label-id"
                     >
                       <input
+                        checked=""
                         class="PrivateSwitchBase-input-id"
                         data-indeterminate="false"
-                        name="noLimits"
+                        name="orderValueRestricted"
                         type="checkbox"
                       />
                       <svg
@@ -20215,7 +20294,7 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page create price 1`]
                         viewBox="0 0 24 24"
                       >
                         <path
-                          d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                          d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
                         />
                       </svg>
                     </span>
@@ -20223,19 +20302,21 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page create price 1`]
                   <span
                     class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
                   >
-                    There are no value limits
+                    Restrict order value
                     <div
-                      class="MuiTypography-root-id OrderValue-caption-id MuiTypography-caption-id"
+                      class="MuiTypography-root-id MuiTypography-caption-id"
                     >
-                      This rate will apply to all orders of all prices
+                      This rate will apply to all orders
                     </div>
                   </span>
                 </label>
                 <div
-                  class="MuiTypography-root-id OrderValue-info-id MuiTypography-caption-id"
-                >
-                  Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
-                </div>
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
+                Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
+                <div
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
               </div>
               <div
                 class="ResponsiveTable-root-id"
@@ -21112,15 +21193,16 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page create weight 1`
               >
                 <span
                   aria-disabled="false"
-                  class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
+                  class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
                 >
                   <span
                     class="MuiIconButton-label-id"
                   >
                     <input
+                      checked=""
                       class="PrivateSwitchBase-input-id"
                       data-indeterminate="false"
-                      name="noLimits"
+                      name="orderValueRestricted"
                       type="checkbox"
                     />
                     <svg
@@ -21130,7 +21212,7 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page create weight 1`
                       viewBox="0 0 24 24"
                     >
                       <path
-                        d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                        d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
                       />
                     </svg>
                   </span>
@@ -21138,14 +21220,17 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page create weight 1`
                 <span
                   class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
                 >
-                  There are no value limits
+                  Restrict order weight
                   <div
-                    class="MuiTypography-root-id OrderWeight-caption-id MuiTypography-caption-id"
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
                     This rate will apply to all orders
                   </div>
                 </span>
               </label>
+              <div
+                class="VerticalSpacer-container-id VerticalSpacer-container-id"
+              />
               <div
                 class="OrderWeight-grid-id"
               >
@@ -21159,16 +21244,23 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page create weight 1`
                     Min. Order Weight
                   </label>
                   <div
-                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                   >
                     <input
                       aria-invalid="false"
-                      class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+                      class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       min="0"
                       name="minValue"
                       type="number"
                       value=""
                     />
+                    <div
+                      class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+                    >
+                      <div
+                        class="MuiTypography-root-id MuiTypography-body1-id"
+                      />
+                    </div>
                     <fieldset
                       aria-hidden="true"
                       class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -21193,16 +21285,23 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page create weight 1`
                     Max. Order Weight
                   </label>
                   <div
-                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                   >
                     <input
                       aria-invalid="false"
-                      class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+                      class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       min=""
                       name="maxValue"
                       type="number"
                       value=""
                     />
+                    <div
+                      class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+                    >
+                      <div
+                        class="MuiTypography-root-id MuiTypography-body1-id"
+                      />
+                    </div>
                     <fieldset
                       aria-hidden="true"
                       class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -22021,7 +22120,7 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page loading 1`] = `
               class="CardTitle-hr-id"
             />
             <div
-              class="MuiCardContent-root-id OrderValue-content-id"
+              class="OrderValue-content-id"
             >
               <div
                 class="OrderValue-subheader-id"
@@ -22031,17 +22130,18 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page loading 1`] = `
                 >
                   <span
                     aria-disabled="true"
-                    class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
+                    class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
                     tabindex="-1"
                   >
                     <span
                       class="MuiIconButton-label-id"
                     >
                       <input
+                        checked=""
                         class="PrivateSwitchBase-input-id"
                         data-indeterminate="false"
                         disabled=""
-                        name="noLimits"
+                        name="orderValueRestricted"
                         type="checkbox"
                       />
                       <svg
@@ -22051,7 +22151,7 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page loading 1`] = `
                         viewBox="0 0 24 24"
                       >
                         <path
-                          d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                          d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
                         />
                       </svg>
                     </span>
@@ -22059,19 +22159,21 @@ exports[`Storyshots Shipping / ShippingZoneRatesCreatePage page loading 1`] = `
                   <span
                     class="MuiTypography-root-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id MuiTypography-body1-id"
                   >
-                    There are no value limits
+                    Restrict order value
                     <div
-                      class="MuiTypography-root-id OrderValue-caption-id MuiTypography-caption-id"
+                      class="MuiTypography-root-id MuiTypography-caption-id"
                     >
-                      This rate will apply to all orders of all prices
+                      This rate will apply to all orders
                     </div>
                   </span>
                 </label>
                 <div
-                  class="MuiTypography-root-id OrderValue-info-id MuiTypography-caption-id"
-                >
-                  Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
-                </div>
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
+                Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
+                <div
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
               </div>
               <div
                 class="ResponsiveTable-root-id"
@@ -238416,7 +238518,7 @@ exports[`Storyshots Views / Shipping / Shipping rate create price rate 1`] = `
               class="CardTitle-hr-id"
             />
             <div
-              class="MuiCardContent-root-id OrderValue-content-id"
+              class="OrderValue-content-id"
             >
               <div
                 class="OrderValue-subheader-id"
@@ -238426,15 +238528,16 @@ exports[`Storyshots Views / Shipping / Shipping rate create price rate 1`] = `
                 >
                   <span
                     aria-disabled="false"
-                    class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
+                    class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
                   >
                     <span
                       class="MuiIconButton-label-id"
                     >
                       <input
+                        checked=""
                         class="PrivateSwitchBase-input-id"
                         data-indeterminate="false"
-                        name="noLimits"
+                        name="orderValueRestricted"
                         type="checkbox"
                       />
                       <svg
@@ -238444,7 +238547,7 @@ exports[`Storyshots Views / Shipping / Shipping rate create price rate 1`] = `
                         viewBox="0 0 24 24"
                       >
                         <path
-                          d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                          d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
                         />
                       </svg>
                     </span>
@@ -238452,19 +238555,21 @@ exports[`Storyshots Views / Shipping / Shipping rate create price rate 1`] = `
                   <span
                     class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
                   >
-                    There are no value limits
+                    Restrict order value
                     <div
-                      class="MuiTypography-root-id OrderValue-caption-id MuiTypography-caption-id"
+                      class="MuiTypography-root-id MuiTypography-caption-id"
                     >
-                      This rate will apply to all orders of all prices
+                      This rate will apply to all orders
                     </div>
                   </span>
                 </label>
                 <div
-                  class="MuiTypography-root-id OrderValue-info-id MuiTypography-caption-id"
-                >
-                  Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
-                </div>
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
+                Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
+                <div
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
               </div>
               <div
                 class="ResponsiveTable-root-id"
@@ -239662,15 +239767,16 @@ exports[`Storyshots Views / Shipping / Shipping rate create weight rate 1`] = `
               >
                 <span
                   aria-disabled="false"
-                  class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
+                  class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
                 >
                   <span
                     class="MuiIconButton-label-id"
                   >
                     <input
+                      checked=""
                       class="PrivateSwitchBase-input-id"
                       data-indeterminate="false"
-                      name="noLimits"
+                      name="orderValueRestricted"
                       type="checkbox"
                     />
                     <svg
@@ -239680,7 +239786,7 @@ exports[`Storyshots Views / Shipping / Shipping rate create weight rate 1`] = `
                       viewBox="0 0 24 24"
                     >
                       <path
-                        d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                        d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
                       />
                     </svg>
                   </span>
@@ -239688,14 +239794,17 @@ exports[`Storyshots Views / Shipping / Shipping rate create weight rate 1`] = `
                 <span
                   class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
                 >
-                  There are no value limits
+                  Restrict order weight
                   <div
-                    class="MuiTypography-root-id OrderWeight-caption-id MuiTypography-caption-id"
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
                     This rate will apply to all orders
                   </div>
                 </span>
               </label>
+              <div
+                class="VerticalSpacer-container-id VerticalSpacer-container-id"
+              />
               <div
                 class="OrderWeight-grid-id"
               >
@@ -239709,16 +239818,23 @@ exports[`Storyshots Views / Shipping / Shipping rate create weight rate 1`] = `
                     Min. Order Weight
                   </label>
                   <div
-                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                   >
                     <input
                       aria-invalid="false"
-                      class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+                      class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       min="0"
                       name="minValue"
                       type="number"
                       value="0"
                     />
+                    <div
+                      class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+                    >
+                      <div
+                        class="MuiTypography-root-id MuiTypography-body1-id"
+                      />
+                    </div>
                     <fieldset
                       aria-hidden="true"
                       class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -239743,16 +239859,23 @@ exports[`Storyshots Views / Shipping / Shipping rate create weight rate 1`] = `
                     Max. Order Weight
                   </label>
                   <div
-                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                   >
                     <input
                       aria-invalid="false"
-                      class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+                      class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       min="0"
                       name="maxValue"
                       type="number"
                       value="80"
                     />
+                    <div
+                      class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+                    >
+                      <div
+                        class="MuiTypography-root-id MuiTypography-body1-id"
+                      />
+                    </div>
                     <fieldset
                       aria-hidden="true"
                       class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -240815,7 +240938,7 @@ exports[`Storyshots Views / Shipping / Shipping rate loading 1`] = `
               class="CardTitle-hr-id"
             />
             <div
-              class="MuiCardContent-root-id OrderValue-content-id"
+              class="OrderValue-content-id"
             >
               <div
                 class="OrderValue-subheader-id"
@@ -240835,7 +240958,7 @@ exports[`Storyshots Views / Shipping / Shipping rate loading 1`] = `
                         class="PrivateSwitchBase-input-id"
                         data-indeterminate="false"
                         disabled=""
-                        name="noLimits"
+                        name="orderValueRestricted"
                         type="checkbox"
                       />
                       <svg
@@ -240853,172 +240976,21 @@ exports[`Storyshots Views / Shipping / Shipping rate loading 1`] = `
                   <span
                     class="MuiTypography-root-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id MuiTypography-body1-id"
                   >
-                    There are no value limits
+                    Restrict order value
                     <div
-                      class="MuiTypography-root-id OrderValue-caption-id MuiTypography-caption-id"
+                      class="MuiTypography-root-id MuiTypography-caption-id"
                     >
-                      This rate will apply to all orders of all prices
+                      This rate will apply to all orders
                     </div>
                   </span>
                 </label>
                 <div
-                  class="MuiTypography-root-id OrderValue-info-id MuiTypography-caption-id"
-                >
-                  Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
-                </div>
-              </div>
-              <div
-                class="ResponsiveTable-root-id"
-              >
-                <table
-                  class="MuiTable-root-id OrderValue-table-id"
-                >
-                  <thead
-                    class="MuiTableHead-root-id"
-                  >
-                    <tr
-                      class="MuiTableRow-root-id MuiTableRow-head-id"
-                    >
-                      <th
-                        class="MuiTableCell-root-id MuiTableCell-head-id OrderValue-colName-id"
-                        scope="col"
-                      >
-                        <span>
-                          Channel name
-                        </span>
-                      </th>
-                      <th
-                        class="MuiTableCell-root-id MuiTableCell-head-id OrderValue-colType-id"
-                        scope="col"
-                      >
-                        <span>
-                          Min. value
-                        </span>
-                      </th>
-                      <th
-                        class="MuiTableCell-root-id MuiTableCell-head-id OrderValue-colType-id"
-                        scope="col"
-                      >
-                        <span>
-                          Max. value
-                        </span>
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody
-                    class="MuiTableBody-root-id"
-                  >
-                    <tr
-                      class="MuiTableRow-root-id"
-                    >
-                      <td
-                        class="MuiTableCell-root-id MuiTableCell-body-id"
-                      >
-                        <div
-                          class="MuiTypography-root-id MuiTypography-body1-id"
-                        >
-                          channel
-                        </div>
-                      </td>
-                      <td
-                        class="MuiTableCell-root-id MuiTableCell-body-id OrderValue-price-id"
-                      >
-                        <div
-                          class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
-                        >
-                          <label
-                            class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
-                            data-shrink="false"
-                          >
-                            Min Value
-                          </label>
-                          <div
-                            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
-                          >
-                            <input
-                              aria-invalid="false"
-                              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                              disabled=""
-                              min="0"
-                              name="minValue:channel"
-                              type="number"
-                              value=""
-                            />
-                            <div
-                              class="MuiInputAdornment-root-id PriceField-currencySymbol-id MuiInputAdornment-positionEnd-id"
-                            >
-                              <div
-                                class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
-                              >
-                                USD
-                              </div>
-                            </div>
-                            <fieldset
-                              aria-hidden="true"
-                              class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                            >
-                              <legend
-                                class="PrivateNotchedOutline-legendLabelled-id"
-                              >
-                                <span>
-                                  Min Value
-                                </span>
-                              </legend>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </td>
-                      <td
-                        class="MuiTableCell-root-id MuiTableCell-body-id OrderValue-price-id"
-                      >
-                        <div
-                          class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
-                        >
-                          <label
-                            class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
-                            data-shrink="false"
-                          >
-                            Max Value
-                          </label>
-                          <div
-                            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
-                          >
-                            <input
-                              aria-invalid="false"
-                              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                              disabled=""
-                              min=""
-                              name="maxValue:channel"
-                              type="number"
-                              value=""
-                            />
-                            <div
-                              class="MuiInputAdornment-root-id PriceField-currencySymbol-id MuiInputAdornment-positionEnd-id"
-                            >
-                              <div
-                                class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
-                              >
-                                USD
-                              </div>
-                            </div>
-                            <fieldset
-                              aria-hidden="true"
-                              class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                            >
-                              <legend
-                                class="PrivateNotchedOutline-legendLabelled-id"
-                              >
-                                <span>
-                                  Max Value
-                                </span>
-                              </legend>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
+                Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
+                <div
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
               </div>
             </div>
           </div>
@@ -241898,7 +241870,7 @@ exports[`Storyshots Views / Shipping / Shipping rate update price rate 1`] = `
               class="CardTitle-hr-id"
             />
             <div
-              class="MuiCardContent-root-id OrderValue-content-id"
+              class="OrderValue-content-id"
             >
               <div
                 class="OrderValue-subheader-id"
@@ -241916,7 +241888,7 @@ exports[`Storyshots Views / Shipping / Shipping rate update price rate 1`] = `
                       <input
                         class="PrivateSwitchBase-input-id"
                         data-indeterminate="false"
-                        name="noLimits"
+                        name="orderValueRestricted"
                         type="checkbox"
                       />
                       <svg
@@ -241934,277 +241906,21 @@ exports[`Storyshots Views / Shipping / Shipping rate update price rate 1`] = `
                   <span
                     class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
                   >
-                    There are no value limits
+                    Restrict order value
                     <div
-                      class="MuiTypography-root-id OrderValue-caption-id MuiTypography-caption-id"
+                      class="MuiTypography-root-id MuiTypography-caption-id"
                     >
-                      This rate will apply to all orders of all prices
+                      This rate will apply to all orders
                     </div>
                   </span>
                 </label>
                 <div
-                  class="MuiTypography-root-id OrderValue-info-id MuiTypography-caption-id"
-                >
-                  Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
-                </div>
-              </div>
-              <div
-                class="ResponsiveTable-root-id"
-              >
-                <table
-                  class="MuiTable-root-id OrderValue-table-id"
-                >
-                  <thead
-                    class="MuiTableHead-root-id"
-                  >
-                    <tr
-                      class="MuiTableRow-root-id MuiTableRow-head-id"
-                    >
-                      <th
-                        class="MuiTableCell-root-id MuiTableCell-head-id OrderValue-colName-id"
-                        scope="col"
-                      >
-                        <span>
-                          Channel name
-                        </span>
-                      </th>
-                      <th
-                        class="MuiTableCell-root-id MuiTableCell-head-id OrderValue-colType-id"
-                        scope="col"
-                      >
-                        <span>
-                          Min. value
-                        </span>
-                      </th>
-                      <th
-                        class="MuiTableCell-root-id MuiTableCell-head-id OrderValue-colType-id"
-                        scope="col"
-                      >
-                        <span>
-                          Max. value
-                        </span>
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody
-                    class="MuiTableBody-root-id"
-                  >
-                    <tr
-                      class="MuiTableRow-root-id"
-                    >
-                      <td
-                        class="MuiTableCell-root-id MuiTableCell-body-id"
-                      >
-                        <div
-                          class="MuiTypography-root-id MuiTypography-body1-id"
-                        >
-                          channel
-                        </div>
-                      </td>
-                      <td
-                        class="MuiTableCell-root-id MuiTableCell-body-id OrderValue-price-id"
-                      >
-                        <div
-                          class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
-                        >
-                          <label
-                            class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
-                            data-shrink="true"
-                          >
-                            Min Value
-                          </label>
-                          <div
-                            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
-                          >
-                            <input
-                              aria-invalid="false"
-                              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                              min="0"
-                              name="minValue:channel"
-                              type="number"
-                              value="0"
-                            />
-                            <div
-                              class="MuiInputAdornment-root-id PriceField-currencySymbol-id MuiInputAdornment-positionEnd-id"
-                            >
-                              <div
-                                class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
-                              >
-                                USD
-                              </div>
-                            </div>
-                            <fieldset
-                              aria-hidden="true"
-                              class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                            >
-                              <legend
-                                class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
-                              >
-                                <span>
-                                  Min Value
-                                </span>
-                              </legend>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </td>
-                      <td
-                        class="MuiTableCell-root-id MuiTableCell-body-id OrderValue-price-id"
-                      >
-                        <div
-                          class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
-                        >
-                          <label
-                            class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
-                            data-shrink="true"
-                          >
-                            Max Value
-                          </label>
-                          <div
-                            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
-                          >
-                            <input
-                              aria-invalid="false"
-                              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                              min="0"
-                              name="maxValue:channel"
-                              type="number"
-                              value="10"
-                            />
-                            <div
-                              class="MuiInputAdornment-root-id PriceField-currencySymbol-id MuiInputAdornment-positionEnd-id"
-                            >
-                              <div
-                                class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
-                              >
-                                USD
-                              </div>
-                            </div>
-                            <fieldset
-                              aria-hidden="true"
-                              class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                            >
-                              <legend
-                                class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
-                              >
-                                <span>
-                                  Max Value
-                                </span>
-                              </legend>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr
-                      class="MuiTableRow-root-id"
-                    >
-                      <td
-                        class="MuiTableCell-root-id MuiTableCell-body-id"
-                      >
-                        <div
-                          class="MuiTypography-root-id MuiTypography-body1-id"
-                        >
-                          test
-                        </div>
-                      </td>
-                      <td
-                        class="MuiTableCell-root-id MuiTableCell-body-id OrderValue-price-id"
-                      >
-                        <div
-                          class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
-                        >
-                          <label
-                            class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
-                            data-shrink="true"
-                          >
-                            Min Value
-                          </label>
-                          <div
-                            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
-                          >
-                            <input
-                              aria-invalid="false"
-                              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                              min="0"
-                              name="minValue:test"
-                              type="number"
-                              value="1"
-                            />
-                            <div
-                              class="MuiInputAdornment-root-id PriceField-currencySymbol-id MuiInputAdornment-positionEnd-id"
-                            >
-                              <div
-                                class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
-                              >
-                                USD
-                              </div>
-                            </div>
-                            <fieldset
-                              aria-hidden="true"
-                              class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                            >
-                              <legend
-                                class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
-                              >
-                                <span>
-                                  Min Value
-                                </span>
-                              </legend>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </td>
-                      <td
-                        class="MuiTableCell-root-id MuiTableCell-body-id OrderValue-price-id"
-                      >
-                        <div
-                          class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
-                        >
-                          <label
-                            class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
-                            data-shrink="true"
-                          >
-                            Max Value
-                          </label>
-                          <div
-                            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
-                          >
-                            <input
-                              aria-invalid="false"
-                              class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
-                              min="1"
-                              name="maxValue:test"
-                              type="number"
-                              value="20"
-                            />
-                            <div
-                              class="MuiInputAdornment-root-id PriceField-currencySymbol-id MuiInputAdornment-positionEnd-id"
-                            >
-                              <div
-                                class="MuiTypography-root-id MuiTypography-body1-id MuiTypography-colorTextSecondary-id"
-                              >
-                                USD
-                              </div>
-                            </div>
-                            <fieldset
-                              aria-hidden="true"
-                              class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                            >
-                              <legend
-                                class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
-                              >
-                                <span>
-                                  Max Value
-                                </span>
-                              </legend>
-                            </fieldset>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
+                Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency
+                <div
+                  class="VerticalSpacer-container-id VerticalSpacer-container-id"
+                />
               </div>
             </div>
           </div>
@@ -243334,15 +243050,16 @@ exports[`Storyshots Views / Shipping / Shipping rate update weight rate 1`] = `
               >
                 <span
                   aria-disabled="false"
-                  class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
+                  class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
                 >
                   <span
                     class="MuiIconButton-label-id"
                   >
                     <input
+                      checked=""
                       class="PrivateSwitchBase-input-id"
                       data-indeterminate="false"
-                      name="noLimits"
+                      name="orderValueRestricted"
                       type="checkbox"
                     />
                     <svg
@@ -243352,7 +243069,7 @@ exports[`Storyshots Views / Shipping / Shipping rate update weight rate 1`] = `
                       viewBox="0 0 24 24"
                     >
                       <path
-                        d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
+                        d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
                       />
                     </svg>
                   </span>
@@ -243360,14 +243077,17 @@ exports[`Storyshots Views / Shipping / Shipping rate update weight rate 1`] = `
                 <span
                   class="MuiTypography-root-id MuiFormControlLabel-label-id MuiTypography-body1-id"
                 >
-                  There are no value limits
+                  Restrict order weight
                   <div
-                    class="MuiTypography-root-id OrderWeight-caption-id MuiTypography-caption-id"
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
                     This rate will apply to all orders
                   </div>
                 </span>
               </label>
+              <div
+                class="VerticalSpacer-container-id VerticalSpacer-container-id"
+              />
               <div
                 class="OrderWeight-grid-id"
               >
@@ -243381,16 +243101,23 @@ exports[`Storyshots Views / Shipping / Shipping rate update weight rate 1`] = `
                     Min. Order Weight
                   </label>
                   <div
-                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                   >
                     <input
                       aria-invalid="false"
-                      class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+                      class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       min="0"
                       name="minValue"
                       type="number"
                       value="0"
                     />
+                    <div
+                      class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+                    >
+                      <div
+                        class="MuiTypography-root-id MuiTypography-body1-id"
+                      />
+                    </div>
                     <fieldset
                       aria-hidden="true"
                       class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
@@ -243415,16 +243142,23 @@ exports[`Storyshots Views / Shipping / Shipping rate update weight rate 1`] = `
                     Max. Order Weight
                   </label>
                   <div
-                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                   >
                     <input
                       aria-invalid="false"
-                      class="MuiInputBase-input-id MuiOutlinedInput-input-id"
+                      class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                       min="0"
                       name="maxValue"
                       type="number"
                       value="80"
                     />
+                    <div
+                      class="MuiInputAdornment-root-id MuiInputAdornment-positionEnd-id"
+                    >
+                      <div
+                        class="MuiTypography-root-id MuiTypography-body1-id"
+                      />
+                    </div>
                     <fieldset
                       aria-hidden="true"
                       class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"