diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/Static/Static.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/Static/Static.tsx
index febb2b71115..44817681888 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/Static/Static.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/Static/Static.tsx
@@ -1,20 +1,15 @@
 import React from 'react';
-import { StyleSheet, View } from 'react-native';
+import { ActivityIndicator, StyleSheet, View } from 'react-native';
 
 import { useStyles } from '../../../../../../../../../component-library/hooks';
 import InfoRow from '../../../../../UI/InfoRow';
 import InfoSection from '../../../../../UI/InfoRow/InfoSection';
-import Loader from '../../../../../../../../../component-library/components-temp/Loader';
 
 const styleSheet = () => StyleSheet.create({
   base: {
     display: 'flex',
     justifyContent: 'space-between',
   },
-  loaderContainer: {
-    display: 'flex',
-    justifyContent: 'center',
-  },
 });
 
 const StaticSimulation: React.FC<{
@@ -32,7 +27,7 @@ const StaticSimulation: React.FC<{
   isLoading,
   isCollapsed = false,
 }) => {
-  const { styles } = useStyles(styleSheet, {});
+  const { styles, theme } = useStyles(styleSheet, {});
 
   return(
     <View style={isCollapsed ? styles.base : {}}>
@@ -41,9 +36,10 @@ const StaticSimulation: React.FC<{
           {description}
         </InfoRow>
         {isLoading ? (
-          <View style={styles.loaderContainer}>
-            <Loader size={'small'} />
-          </View>
+          <ActivityIndicator
+            size="small"
+            color={theme.colors.warning.default}
+          />
         ) : (
           simulationElements
           )}
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/TypedSignDecoded/TypedSignDecoded.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/TypedSignDecoded/TypedSignDecoded.tsx
index 2adc5d40fec..d51866173b2 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/TypedSignDecoded/TypedSignDecoded.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/TypedSignDecoded/TypedSignDecoded.tsx
@@ -110,20 +110,20 @@ const StateChangeRow = ({
     (changeType === DecodingDataChangeType.Approve ||
       changeType === DecodingDataChangeType.Revoke);
 
-  const changeLabel = shouldDisplayLabel
+  const labelChangeType = shouldDisplayLabel
     ? getStateChangeLabelMap(changeType, nftTransactionType)
     : '';
 
   return (
     <InfoRow
-      label={changeLabel}
+      label={labelChangeType}
       tooltip={tooltip}
     >
       {(assetType === TokenStandard.ERC20 ||
         assetType === TokenStandard.ERC721 ||
         assetType === TokenStandard.ERC1155) && (
         <SimulationValueDisplay
-          labelChangeType={changeType}
+          modalHeaderText={changeType}
           tokenContract={contractAddress}
           value={amount}
           chainId={chainId}
@@ -145,7 +145,7 @@ const StateChangeRow = ({
             changeType === DecodingDataChangeType.Receive
           }
           debit={changeType === DecodingDataChangeType.Transfer}
-          labelChangeType={changeLabel}
+          modalHeaderText={labelChangeType}
         />
       )}
     </InfoRow>
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/TypedSignPermit/TypedSignPermit.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/TypedSignPermit/TypedSignPermit.tsx
index bb326cb1463..9594f48ed6e 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/TypedSignPermit/TypedSignPermit.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/TypedSignPermit/TypedSignPermit.tsx
@@ -95,7 +95,7 @@ const PermitSimulation = () => {
               ) => (
                 <PermitSimulationValueDisplay
                   key={`${token}-${i}`}
-                  labelChangeType={labelChangeType}
+                  modalHeaderText={labelChangeType}
                   networkClientId={networkClientId}
                   primaryType={primaryType}
                   tokenContract={safeToChecksumAddress(token)}
@@ -107,7 +107,7 @@ const PermitSimulation = () => {
           </View>
         ) : (
           <PermitSimulationValueDisplay
-            labelChangeType={labelChangeType}
+            modalHeaderText={labelChangeType}
             networkClientId={networkClientId}
             tokenContract={verifyingContract}
             value={message.value}
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/NativeValueDisplay/NativeValueDisplay.test.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/NativeValueDisplay/NativeValueDisplay.test.tsx
index f0ab367e2ee..1c15ff3552c 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/NativeValueDisplay/NativeValueDisplay.test.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/NativeValueDisplay/NativeValueDisplay.test.tsx
@@ -14,7 +14,7 @@ describe('NativeValueDisplay', () => {
   it('renders component correctly', async () => {
     const { findByText } = renderWithProvider(
       <NativeValueDisplay
-        labelChangeType={'Spending Cap'}
+        modalHeaderText={'Spending Cap'}
         value={'4321'}
         chainId={'0x1'}
       />,
@@ -28,7 +28,7 @@ describe('NativeValueDisplay', () => {
   it('displays modal when clicking on the value', async () => {
     const { findByText } = renderWithProvider(
       <NativeValueDisplay
-        labelChangeType={'Spending Cap'}
+        modalHeaderText={'Spending Cap'}
         value={'4321'}
         chainId={'0x1'}
       />,
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/NativeValueDisplay/NativeValueDisplay.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/NativeValueDisplay/NativeValueDisplay.tsx
index 54ad3cd28e8..52c3073fee7 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/NativeValueDisplay/NativeValueDisplay.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/NativeValueDisplay/NativeValueDisplay.tsx
@@ -37,8 +37,8 @@ interface PermitSimulationValueDisplayParams {
   /** ID of the associated chain. */
   chainId: Hex;
 
-  /** Change type to be displayed in value tooltip */
-  labelChangeType: string;
+  /** Modal header text to be displayed in the value modal */
+  modalHeaderText: string;
 
   /** The token amount */
   value: number | string;
@@ -54,7 +54,7 @@ const NativeValueDisplay: React.FC<PermitSimulationValueDisplayParams> = ({
   chainId,
   credit,
   debit,
-  labelChangeType,
+  modalHeaderText,
   value,
 }) => {
   const [hasValueModalOpen, setHasValueModalOpen] = useState(false);
@@ -136,7 +136,7 @@ const NativeValueDisplay: React.FC<PermitSimulationValueDisplayParams> = ({
                     iconName={IconName.ArrowLeft}
                   />
                   <Text style={styles.valueModalHeaderText}>
-                    {labelChangeType}
+                    {modalHeaderText}
                   </Text>
                 </View>
                 <Text style={styles.valueModalText}>
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.test.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.test.tsx
index 6881dbed1b1..dc6e376c363 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.test.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.test.tsx
@@ -71,7 +71,7 @@ describe('SimulationValueDisplay', () => {
 
     const { findByText } = renderWithProvider(
       <SimulationValueDisplay
-        labelChangeType={'Spending Cap'}
+        modalHeaderText={'Spending Cap'}
         tokenContract={'0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'}
         value={'4321'}
         chainId={'0x1'}
@@ -90,7 +90,7 @@ describe('SimulationValueDisplay', () => {
 
     const { findByTestId } = renderWithProvider(
       <SimulationValueDisplay
-        labelChangeType={'Spending Cap'}
+        modalHeaderText={'Spending Cap'}
         tokenContract={'0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'}
         value={'4321'}
         chainId={'0x1'}
@@ -116,7 +116,7 @@ describe('SimulationValueDisplay', () => {
     const { findByText } = renderWithProvider(
       <SimulationValueDisplay
         canDisplayValueAsUnlimited
-        labelChangeType={'Spending Cap'}
+        modalHeaderText={'Spending Cap'}
         tokenContract={'0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'}
         value={'1461501637330902918203684832716283019655932542975'}
         chainId={'0x1'}
@@ -145,7 +145,7 @@ describe('SimulationValueDisplay', () => {
 
     renderWithProvider(
       <SimulationValueDisplay
-        labelChangeType={'Spending Cap'}
+        modalHeaderText={'Spending Cap'}
         tokenContract={'0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'}
         value={'4321'}
         chainId={'0x1'}
@@ -174,7 +174,7 @@ describe('SimulationValueDisplay', () => {
 
     renderWithProvider(
       <SimulationValueDisplay
-        labelChangeType={'Spending Cap'}
+        modalHeaderText={'Spending Cap'}
         tokenContract={'0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'}
         value={'4321'}
         chainId={'0x1'}
@@ -197,7 +197,7 @@ describe('SimulationValueDisplay', () => {
     it('does not invoke method to track missing decimal information', async () => {
       renderWithProvider(
         <SimulationValueDisplay
-          labelChangeType={'Withdraw'}
+          modalHeaderText={'Withdraw'}
           tokenContract={'0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'}
           tokenId={'1234'}
           value={'4321'}
diff --git a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.tsx b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.tsx
index c5cb1ac27a5..152e0ef6c82 100644
--- a/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.tsx
+++ b/app/components/Views/confirmations/components/Confirm/Info/TypedSignV3V4/Simulation/components/ValueDisplay/ValueDisplay.tsx
@@ -44,8 +44,8 @@ interface SimulationValueDisplayParams {
   /** ID of the associated chain. */
   chainId: Hex;
 
-  /** Change type to be displayed in value tooltip */
-  labelChangeType: string;
+  /** Header text to be displayed in the value modal */
+  modalHeaderText: string;
 
   /** The network client ID */
   networkClientId?: NetworkClientId;
@@ -80,7 +80,7 @@ interface SimulationValueDisplayParams {
 
 const SimulationValueDisplay: React.FC<SimulationValueDisplayParams> = ({
   chainId,
-  labelChangeType,
+  modalHeaderText,
   networkClientId,
   primaryType,
   tokenContract,
@@ -224,7 +224,7 @@ const SimulationValueDisplay: React.FC<SimulationValueDisplayParams> = ({
                   iconName={IconName.ArrowLeft}
                 />
                 <Text style={styles.valueModalHeaderText}>
-                  {labelChangeType}
+                  {modalHeaderText}
                 </Text>
               </View>
               <Text style={styles.valueModalText}>