diff --git a/packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md b/packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md
new file mode 100644
index 00000000000..ae7b46a0c05
--- /dev/null
+++ b/packages/manager/.changeset/pr-13165-upcoming-features-1764951969980.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+UX/UI enhancements for RuleSets and Prefix Lists ([#13165](https://github.com/linode/manager/pull/13165))
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
index 083634c3063..845b5486e63 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallPrefixListDrawer.tsx
@@ -1,5 +1,13 @@
 import { useAllFirewallPrefixListsQuery } from '@linode/queries';
-import { Box, Button, Chip, Drawer, Paper, TooltipIcon } from '@linode/ui';
+import {
+  Box,
+  Button,
+  Chip,
+  Drawer,
+  Paper,
+  Stack,
+  TooltipIcon,
+} from '@linode/ui';
 import { capitalize } from '@linode/utilities';
 import * as React from 'react';
 
@@ -225,140 +233,144 @@ export const FirewallPrefixListDrawer = React.memo(
                 </StyledListItem>
               )}
 
-              {isIPv4Supported && (
-                <Paper
-                  data-testid="ipv4-section"
-                  sx={(theme) => ({
-                    backgroundColor: theme.tokens.alias.Background.Neutral,
-                    padding: theme.spacingFunction(12),
-                    marginTop: theme.spacingFunction(8),
-                    ...(isIPv4InUse
-                      ? {
-                          border: `1px solid ${theme.tokens.alias.Border.Positive}`,
-                        }
-                      : {}),
-                  })}
-                >
-                  <StyledLabel
+              <Stack gap={2} marginTop={1}>
+                {isIPv4Supported && (
+                  <Paper
+                    data-testid="ipv4-section"
                     sx={(theme) => ({
-                      display: 'flex',
-                      justifyContent: 'space-between',
-                      marginBottom: theme.spacingFunction(4),
-                      ...(!isIPv4InUse
+                      backgroundColor: theme.tokens.alias.Background.Neutral,
+                      padding: theme.spacingFunction(12),
+                      ...(isIPv4InUse
                         ? {
-                            color:
-                              theme.tokens.alias.Content.Text.Primary.Disabled,
+                            border: `1px solid ${theme.tokens.alias.Border.Positive}`,
                           }
                         : {}),
                     })}
                   >
-                    IPv4
-                    <Chip
-                      data-testid="ipv4-chip"
-                      label={isIPv4InUse ? 'in use' : 'not in use'}
+                    <StyledLabel
                       sx={(theme) => ({
-                        background: isIPv4InUse
-                          ? theme.tokens.component.Badge.Positive.Subtle
-                              .Background
-                          : theme.tokens.component.Badge.Neutral.Subtle
-                              .Background,
-                        color: isIPv4InUse
-                          ? theme.tokens.component.Badge.Positive.Subtle.Text
-                          : theme.tokens.component.Badge.Neutral.Subtle.Text,
-                        font: theme.font.bold,
-                        fontSize: theme.tokens.font.FontSize.Xxxs,
-                        marginRight: theme.spacingFunction(6),
-                        flexShrink: 0,
+                        display: 'flex',
+                        justifyContent: 'space-between',
+                        marginBottom: theme.spacingFunction(4),
+                        ...(!isIPv4InUse
+                          ? {
+                              color:
+                                theme.tokens.alias.Content.Text.Primary
+                                  .Disabled,
+                            }
+                          : {}),
                       })}
-                    />
-                  </StyledLabel>
+                    >
+                      IPv4
+                      <Chip
+                        data-testid="ipv4-chip"
+                        label={isIPv4InUse ? 'in use' : 'not in use'}
+                        sx={(theme) => ({
+                          background: isIPv4InUse
+                            ? theme.tokens.component.Badge.Positive.Subtle
+                                .Background
+                            : theme.tokens.component.Badge.Neutral.Subtle
+                                .Background,
+                          color: isIPv4InUse
+                            ? theme.tokens.component.Badge.Positive.Subtle.Text
+                            : theme.tokens.component.Badge.Neutral.Subtle.Text,
+                          font: theme.font.bold,
+                          fontSize: theme.tokens.font.FontSize.Xxxs,
+                          marginRight: theme.spacingFunction(6),
+                          flexShrink: 0,
+                        })}
+                      />
+                    </StyledLabel>
 
-                  <StyledListItem
-                    component="span"
-                    sx={(theme) => ({
-                      ...(!isIPv4InUse
-                        ? {
-                            color:
-                              theme.tokens.alias.Content.Text.Primary.Disabled,
-                          }
-                        : {}),
-                    })}
-                  >
-                    {prefixListDetails.ipv4!.length > 0 ? (
-                      prefixListDetails.ipv4!.join(', ')
-                    ) : (
-                      <i>no IP addresses</i>
-                    )}
-                  </StyledListItem>
-                </Paper>
-              )}
+                    <StyledListItem
+                      component="span"
+                      sx={(theme) => ({
+                        ...(!isIPv4InUse
+                          ? {
+                              color:
+                                theme.tokens.alias.Content.Text.Primary
+                                  .Disabled,
+                            }
+                          : {}),
+                      })}
+                    >
+                      {prefixListDetails.ipv4!.length > 0 ? (
+                        prefixListDetails.ipv4!.join(', ')
+                      ) : (
+                        <i>no IP addresses</i>
+                      )}
+                    </StyledListItem>
+                  </Paper>
+                )}
 
-              {isIPv6Supported && (
-                <Paper
-                  data-testid="ipv6-section"
-                  sx={(theme) => ({
-                    backgroundColor: theme.tokens.alias.Background.Neutral,
-                    padding: theme.spacingFunction(12),
-                    marginTop: theme.spacingFunction(8),
-                    ...(isIPv6InUse
-                      ? {
-                          border: `1px solid ${theme.tokens.alias.Border.Positive}`,
-                        }
-                      : {}),
-                  })}
-                >
-                  <StyledLabel
+                {isIPv6Supported && (
+                  <Paper
+                    data-testid="ipv6-section"
                     sx={(theme) => ({
-                      display: 'flex',
-                      justifyContent: 'space-between',
-                      marginBottom: theme.spacingFunction(4),
-                      ...(!isIPv6InUse
+                      backgroundColor: theme.tokens.alias.Background.Neutral,
+                      padding: theme.spacingFunction(12),
+                      ...(isIPv6InUse
                         ? {
-                            color:
-                              theme.tokens.alias.Content.Text.Primary.Disabled,
+                            border: `1px solid ${theme.tokens.alias.Border.Positive}`,
                           }
                         : {}),
                     })}
                   >
-                    IPv6
-                    <Chip
-                      data-testid="ipv6-chip"
-                      label={isIPv6InUse ? 'in use' : 'not in use'}
+                    <StyledLabel
                       sx={(theme) => ({
-                        background: isIPv6InUse
-                          ? theme.tokens.component.Badge.Positive.Subtle
-                              .Background
-                          : theme.tokens.component.Badge.Neutral.Subtle
-                              .Background,
-                        color: isIPv6InUse
-                          ? theme.tokens.component.Badge.Positive.Subtle.Text
-                          : theme.tokens.component.Badge.Neutral.Subtle.Text,
-                        font: theme.font.bold,
-                        fontSize: theme.tokens.font.FontSize.Xxxs,
-                        marginRight: theme.spacingFunction(6),
-                        flexShrink: 0,
+                        display: 'flex',
+                        justifyContent: 'space-between',
+                        marginBottom: theme.spacingFunction(4),
+                        ...(!isIPv6InUse
+                          ? {
+                              color:
+                                theme.tokens.alias.Content.Text.Primary
+                                  .Disabled,
+                            }
+                          : {}),
                       })}
-                    />
-                  </StyledLabel>
-                  <StyledListItem
-                    component="span"
-                    sx={(theme) => ({
-                      ...(!isIPv6InUse
-                        ? {
-                            color:
-                              theme.tokens.alias.Content.Text.Primary.Disabled,
-                          }
-                        : {}),
-                    })}
-                  >
-                    {prefixListDetails.ipv6!.length > 0 ? (
-                      prefixListDetails.ipv6!.join(', ')
-                    ) : (
-                      <i>no IP addresses</i>
-                    )}
-                  </StyledListItem>
-                </Paper>
-              )}
+                    >
+                      IPv6
+                      <Chip
+                        data-testid="ipv6-chip"
+                        label={isIPv6InUse ? 'in use' : 'not in use'}
+                        sx={(theme) => ({
+                          background: isIPv6InUse
+                            ? theme.tokens.component.Badge.Positive.Subtle
+                                .Background
+                            : theme.tokens.component.Badge.Neutral.Subtle
+                                .Background,
+                          color: isIPv6InUse
+                            ? theme.tokens.component.Badge.Positive.Subtle.Text
+                            : theme.tokens.component.Badge.Neutral.Subtle.Text,
+                          font: theme.font.bold,
+                          fontSize: theme.tokens.font.FontSize.Xxxs,
+                          marginRight: theme.spacingFunction(6),
+                          flexShrink: 0,
+                        })}
+                      />
+                    </StyledLabel>
+                    <StyledListItem
+                      component="span"
+                      sx={(theme) => ({
+                        ...(!isIPv6InUse
+                          ? {
+                              color:
+                                theme.tokens.alias.Content.Text.Primary
+                                  .Disabled,
+                            }
+                          : {}),
+                      })}
+                    >
+                      {prefixListDetails.ipv6!.length > 0 ? (
+                        prefixListDetails.ipv6!.join(', ')
+                      ) : (
+                        <i>no IP addresses</i>
+                      )}
+                    </StyledListItem>
+                  </Paper>
+                )}
+              </Stack>
             </>
           )}
 
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
index ef26ae33514..401e0b63459 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleForm.tsx
@@ -347,7 +347,7 @@ export const FirewallRuleForm = React.memo((props: FirewallRuleFormProps) => {
             tooltip={ipNetmaskTooltipText}
           />
           {isFirewallRulesetsPrefixlistsFeatureEnabled && (
-            <MultiplePrefixListSelect
+            <StyledMultiplePrefixListSelect
               aria-label="Prefix List for Firewall rule"
               handleOpenPrefixListDrawer={handleOpenPrefixListDrawer}
               onChange={handlePrefixListChange}
@@ -400,3 +400,9 @@ const StyledMultipleIPInput = styled(MultipleIPInput, {
 })(({ theme, ips }) => ({
   ...(ips.length !== 0 ? { marginTop: theme.spacingFunction(16) } : {}),
 }));
+
+const StyledMultiplePrefixListSelect = styled(MultiplePrefixListSelect, {
+  label: 'StyledMultipleIPInput',
+})(({ theme, pls }) => ({
+  ...(pls.length !== 0 ? { marginTop: theme.spacingFunction(16) } : {}),
+}));
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
index ebeff8eec5b..69a4a59f3e6 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx
@@ -25,7 +25,6 @@ import { prop, uniqBy } from 'ramda';
 import * as React from 'react';
 
 import Undo from 'src/assets/icons/undo.svg';
-import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
 import { Link } from 'src/components/Link';
 import { MaskableText } from 'src/components/MaskableText/MaskableText';
 import { Table } from 'src/components/Table';
@@ -42,6 +41,7 @@ import {
   predefinedFirewallFromRule as ruleToPredefinedFirewall,
   useIsFirewallRulesetsPrefixlistsEnabled,
 } from 'src/features/Firewalls/shared';
+import { IPAddress } from 'src/features/Linodes/LinodesLanding/IPAddress';
 import { CustomKeyboardSensor } from 'src/utilities/CustomKeyboardSensor';
 
 import { FirewallRuleActionMenu } from './FirewallRuleActionMenu';
@@ -55,7 +55,6 @@ import {
   StyledTableRow,
 } from './FirewallRuleTable.styles';
 import { sortPortString } from './shared';
-import { useStyles } from './shared.styles';
 
 import type { FirewallRuleDrawerMode } from './FirewallRuleDrawer.types';
 import type { ExtendedFirewallRule, RuleStatus } from './firewallRuleEditor';
@@ -384,17 +383,29 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
     zIndex: isDragging ? 9999 : 0,
   } as const;
 
-  const { classes } = useStyles();
+  const [isHovered, setIsHovered] = React.useState(false);
+
+  const handleMouseEnter = React.useCallback(() => {
+    setIsHovered(true);
+  }, []);
+
+  const handleMouseLeave = React.useCallback(() => {
+    setIsHovered(false);
+  }, []);
 
   if (isRuleSetLoading) {
     return <TableRowLoading columns={smDown ? 3 : lgDown ? 5 : 6} />;
   }
 
+  const ruleSetCopyableId = `${rulesetDetails ? 'ID:' : 'Ruleset ID:'} ${ruleset}`;
+
   return (
     <StyledTableRow
       aria-label={label ?? `firewall rule ${id}`}
       disabled={disabled}
       key={id}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
       originalIndex={originalIndex}
       ref={setNodeRef}
       ruleIndex={index}
@@ -439,47 +450,35 @@ const FirewallRuleTableRow = React.memo((props: FirewallRuleTableRowProps) => {
       )}
 
       {isRuleSetRowEnabled && (
-        <>
-          <TableCell aria-label={`Label: ${label}`}>
-            <Box
-              alignItems="center"
-              display="flex"
-              gap={rulesetDetails ? 1 : 0}
-            >
-              <Box alignItems="center" display="flex">
-                <StyledDragIndicator
-                  aria-label="Drag indicator icon"
-                  sx={{ flexShrink: 0 }}
-                />
-                {rulesetDetails && (
-                  <Link
-                    onClick={() =>
-                      handleOpenRuleSetDrawerForViewing?.(rulesetDetails.id)
-                    }
-                  >
-                    {rulesetDetails?.label}
-                  </Link>
-                )}
-              </Box>
-              <Hidden smDown={!!rulesetDetails}>
-                <Box
-                  sx={{
-                    alignItems: 'center',
-                    display: 'flex',
-                  }}
+        <TableCell
+          aria-label={`Label: ${label}`}
+          colSpan={smDown ? 2 : lgDown ? 4 : 5}
+        >
+          <Box
+            alignItems="center"
+            display="flex"
+            gap={rulesetDetails ? 1.5 : 0}
+          >
+            <Box alignItems="center" display="flex">
+              <StyledDragIndicator
+                aria-label="Drag indicator icon"
+                sx={{ flexShrink: 0 }}
+              />
+              {rulesetDetails && (
+                <Link
+                  onClick={() =>
+                    handleOpenRuleSetDrawerForViewing?.(rulesetDetails.id)
+                  }
                 >
-                  <span>{rulesetDetails ? 'ID:' : 'Rule Set ID:'}&nbsp;</span>
-                  <span>{ruleset}</span>
-                  <CopyTooltip
-                    className={classes.copyIcon}
-                    text={String(ruleset)}
-                  />
-                </Box>
-              </Hidden>
+                  {rulesetDetails?.label}
+                </Link>
+              )}
             </Box>
-          </TableCell>
-          <TableCell colSpan={smDown ? 0 : lgDown ? 3 : 4} />
-        </>
+            <Box sx={{ whiteSpace: 'nowrap' }}>
+              <IPAddress ips={[ruleSetCopyableId]} isHovered={isHovered} />
+            </Box>
+          </Box>
+        </TableCell>
       )}
 
       <TableCell>
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
index 67e3312427f..cb13e874b4a 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/MultiplePrefixListSelect.tsx
@@ -32,21 +32,26 @@ const useStyles = makeStyles()((theme: Theme) => ({
       justifyContent: 'flex-start',
     },
     paddingLeft: 0,
-    paddingTop: theme.spacingFunction(12),
+    paddingTop: theme.spacingFunction(12), // default when empty
+  },
+  addPLReducedPadding: {
+    paddingTop: theme.spacingFunction(4), // when last row is selected
+  },
+  autocomplete: {
+    "& [data-testid='inputLabelWrapper']": {
+      display: 'none',
+    },
   },
   button: {
     '& > span': {
       padding: 2,
     },
+    marginTop: theme.spacingFunction(8),
     marginLeft: `-${theme.spacingFunction(8)}`,
-    marginTop: 4,
-    minHeight: 'auto',
-    minWidth: 'auto',
+    height: 20,
+    width: 20,
     padding: 0,
   },
-  root: {
-    marginTop: theme.spacingFunction(8),
-  },
 }));
 
 const isPrefixListSupported = (pl: FirewallPrefixList) =>
@@ -216,6 +221,9 @@ export const MultiplePrefixListSelect = React.memo(
       return null;
     }
 
+    const lastRowSelected =
+      pls.length > 0 && pls[pls.length - 1].address !== '';
+
     const renderRow = (thisPL: ExtendedPL, idx: number) => {
       const availableOptions = getAvailableOptions(idx, thisPL.address);
 
@@ -237,6 +245,19 @@ export const MultiplePrefixListSelect = React.memo(
       const disableIPv4 = ipv4Unsupported || ipv4Forced;
       const disableIPv6 = ipv6Unsupported || ipv6Forced;
 
+      const getCheckboxTooltipText = (
+        ipUnsupported?: boolean,
+        ipForced?: boolean
+      ) => {
+        if (ipUnsupported) {
+          return 'Not supported by this Prefix List';
+        }
+        if (ipForced) {
+          return 'At least one array must be selected';
+        }
+        return undefined;
+      };
+
       return (
         <Grid
           container
@@ -250,6 +271,7 @@ export const MultiplePrefixListSelect = React.memo(
         >
           <Grid size={11}>
             <Autocomplete
+              className={classes.autocomplete}
               disableClearable={prefixLists.length > 0}
               disabled={disabled}
               errorText={thisPL.error}
@@ -274,20 +296,32 @@ export const MultiplePrefixListSelect = React.memo(
                 sx={{ ml: 0.4 }}
               >
                 <Box display="flex" gap={2}>
-                  <Checkbox
-                    checked={thisPL.inIPv4Rule === true}
-                    data-testid={`ipv4-checkbox-${idx}`}
-                    disabled={disableIPv4 || disabled}
-                    onChange={() => handleToggleIPv4(!thisPL.inIPv4Rule, idx)}
-                    text="IPv4"
-                  />
-                  <Checkbox
-                    checked={thisPL.inIPv6Rule === true}
-                    data-testid={`ipv6-checkbox-${idx}`}
-                    disabled={disableIPv6 || disabled}
-                    onChange={() => handleToggleIPv6(!thisPL.inIPv6Rule, idx)}
-                    text="IPv6"
-                  />
+                  <Stack direction="row">
+                    <Checkbox
+                      checked={thisPL.inIPv4Rule === true}
+                      data-testid={`ipv4-checkbox-${idx}`}
+                      disabled={disableIPv4 || disabled}
+                      onChange={() => handleToggleIPv4(!thisPL.inIPv4Rule, idx)}
+                      text="IPv4"
+                      toolTipText={getCheckboxTooltipText(
+                        ipv4Unsupported,
+                        ipv4Forced
+                      )}
+                    />
+                  </Stack>
+                  <Stack direction="row">
+                    <Checkbox
+                      checked={thisPL.inIPv6Rule === true}
+                      data-testid={`ipv6-checkbox-${idx}`}
+                      disabled={disableIPv6 || disabled}
+                      onChange={() => handleToggleIPv6(!thisPL.inIPv6Rule, idx)}
+                      text="IPv6"
+                      toolTipText={getCheckboxTooltipText(
+                        ipv6Unsupported,
+                        ipv6Forced
+                      )}
+                    />
+                  </Stack>
                 </Box>
                 <Box alignItems="center" display="flex">
                   <LinkButton
@@ -311,11 +345,6 @@ export const MultiplePrefixListSelect = React.memo(
               data-testid="button"
               disabled={disabled}
               onClick={() => removeInput(idx)}
-              sx={(theme) => ({
-                height: 20,
-                width: 20,
-                marginTop: `${theme.spacingFunction(16)} !important`,
-              })}
             >
               <CloseIcon data-testid={`delete-pl-${idx}`} />
             </IconButton>
@@ -325,11 +354,11 @@ export const MultiplePrefixListSelect = React.memo(
     };
 
     return (
-      <div className={cx(classes.root, className)}>
+      <div className={cx(className)}>
         {/* Display the title only when pls.length > 0 (i.e., at least one PL row is added) */}
         {pls.length > 0 && (
           <Box display="flex">
-            <InputLabel sx={{ margin: 0 }}>Prefix List</InputLabel>
+            <InputLabel>Prefix List</InputLabel>
             {getFeatureChip({
               isFirewallRulesetsPrefixlistsFeatureEnabled,
               isFirewallRulesetsPrefixListsBetaEnabled,
@@ -342,7 +371,10 @@ export const MultiplePrefixListSelect = React.memo(
         </Stack>
         <Button
           buttonType="secondary"
-          className={classes.addPL}
+          className={cx(
+            classes.addPL,
+            lastRowSelected && classes.addPLReducedPadding // Reduce top padding when last PL selected
+          )}
           compactX
           disabled={disabled}
           onClick={addNewInput}
diff --git a/packages/manager/src/features/Firewalls/shared.test.tsx b/packages/manager/src/features/Firewalls/shared.test.tsx
index d73064fb1e8..529fd807909 100644
--- a/packages/manager/src/features/Firewalls/shared.test.tsx
+++ b/packages/manager/src/features/Firewalls/shared.test.tsx
@@ -230,6 +230,14 @@ describe('buildPrefixListMap', () => {
 describe('generateAddressesLabelV2', () => {
   const onPrefixListClick = vi.fn();
 
+  /**
+   * Expected display order of addresses:
+   * '192.168.1.1',
+   * '2001:db8:85a3::8a2e:370:7334/128',
+   * 'pl:system:test-1 (IPv4, IPv6)',
+   * 'pl::test-2 (IPv4)',
+   * 'pl::test-3 (IPv6)'
+   */
   const addresses: FirewallRuleType['addresses'] = {
     ipv4: [
       'pl:system:test-1', // PL attached to both IPv4/IPv6
@@ -328,15 +336,15 @@ describe('generateAddressesLabelV2', () => {
     });
     const { getByText, queryByText } = renderWithTheme(<>{result}</>);
 
-    expect(getByText('pl:system:test-1 (IPv4, IPv6)')).toBeVisible();
+    expect(getByText('192.168.1.1')).toBeVisible();
 
     expect(getByText('+4')).toBeVisible(); // 5 total elements (1 shown + 4 hidden)
 
     // Hidden items are not rendered outside tooltip
+    expect(queryByText('2001:db8:85a3::8a2e:370:7334/128')).toBeNull();
+    expect(queryByText('pl:system:test-1 (IPv4, IPv6)')).toBeNull();
     expect(queryByText('pl::test-2 (IPv4)')).toBeNull();
     expect(queryByText('pl::test-3 (IPv6)')).toBeNull();
-    expect(queryByText('192.168.1.1')).toBeNull();
-    expect(queryByText('2001:db8:85a3::8a2e:370:7334/128')).toBeNull();
   });
 
   it('renders all items if showTruncateChip is false', () => {
@@ -366,11 +374,11 @@ describe('generateAddressesLabelV2', () => {
     );
 
     // Only the first 2 elements are visible outside tooltip
-    expect(getByText('pl:system:test-1 (IPv4, IPv6)')).toBeVisible();
-    expect(getByText('pl::test-2 (IPv4)')).toBeVisible();
+    expect(getByText('192.168.1.1')).toBeVisible();
+    expect(getByText('2001:db8:85a3::8a2e:370:7334/128')).toBeVisible();
+    expect(queryByText('pl:system:test-1 (IPv4, IPv6)')).toBeNull();
+    expect(queryByText('pl::test-2 (IPv4)')).toBeNull();
     expect(queryByText('pl::test-3 (IPv6)')).toBeNull();
-    expect(queryByText('192.168.1.1')).toBeNull();
-    expect(queryByText('2001:db8:85a3::8a2e:370:7334/128')).toBeNull();
 
     // Chip shows correct hidden count
     const chip = getByText('+3');
@@ -385,9 +393,9 @@ describe('generateAddressesLabelV2', () => {
     // Check that only hidden items are present in tooltip
     expect(tooltipItems).toHaveLength(3);
     expect(tooltipItems.map((item) => item.textContent)).toEqual([
+      'pl:system:test-1 (IPv4, IPv6)',
+      'pl::test-2 (IPv4)',
       'pl::test-3 (IPv6)',
-      '192.168.1.1',
-      '2001:db8:85a3::8a2e:370:7334/128',
     ]);
   });
 });
diff --git a/packages/manager/src/features/Firewalls/shared.tsx b/packages/manager/src/features/Firewalls/shared.tsx
index 77d66940084..b236b0c695a 100644
--- a/packages/manager/src/features/Firewalls/shared.tsx
+++ b/packages/manager/src/features/Firewalls/shared.tsx
@@ -411,6 +411,24 @@ export const generateAddressesLabelV2 = (
     elements.push('All IPv6');
   }
 
+  // Add remaining IPv4 addresses that are not prefix lists
+  if (!allowedAllIPv4) {
+    addresses?.ipv4?.forEach((ip) => {
+      if (!isPrefixList(ip)) {
+        elements.push(<span key={ip}>{ip}</span>);
+      }
+    });
+  }
+
+  // Add remaining IPv6 addresses that are not prefix lists
+  if (!allowedAllIPv6) {
+    addresses?.ipv6?.forEach((ip) => {
+      if (!isPrefixList(ip)) {
+        elements.push(<span key={ip}>{ip}</span>);
+      }
+    });
+  }
+
   // Build a map of prefix lists.
   // NOTE: If "allowedAllIPv4" or "allowedAllIPv6" is true, we skip those IPs entirely
   // because "All IPvX" is already represented, and there are no specific addresses to map.
@@ -446,24 +464,6 @@ export const generateAddressesLabelV2 = (
     );
   });
 
-  // Add remaining IPv4 addresses that are not prefix lists
-  if (!allowedAllIPv4) {
-    addresses?.ipv4?.forEach((ip) => {
-      if (!isPrefixList(ip)) {
-        elements.push(<span key={ip}>{ip}</span>);
-      }
-    });
-  }
-
-  // Add remaining IPv6 addresses that are not prefix lists
-  if (!allowedAllIPv6) {
-    addresses?.ipv6?.forEach((ip) => {
-      if (!isPrefixList(ip)) {
-        elements.push(<span key={ip}>{ip}</span>);
-      }
-    });
-  }
-
   // If no IPs are allowed
   if (elements.length === 0) return 'None';
 
@@ -478,18 +478,18 @@ export const generateAddressesLabelV2 = (
       sx={(theme) => ({
         maxHeight: '40vh',
         overflowY: 'auto',
-        // Extra space on the right to prevent scrollbar from overlapping content
-        paddingRight: theme.spacingFunction(8),
+        px: theme.spacingFunction(16),
       })}
     >
-      <ul
-        style={{
+      <Box
+        component="ul"
+        sx={(theme) => ({
           display: 'flex',
           flexDirection: 'column',
-          gap: 4,
-          paddingLeft: 20,
+          gap: 0.5,
+          px: theme.spacingFunction(20),
           margin: 0,
-        }}
+        })}
       >
         {hiddenElements.map((el, i) => (
           <li
@@ -500,7 +500,7 @@ export const generateAddressesLabelV2 = (
             {el}
           </li>
         ))}
-      </ul>
+      </Box>
     </Box>
   );
 
@@ -522,13 +522,13 @@ export const generateAddressesLabelV2 = (
       </Box>
       {hasMore && (
         <Tooltip
-          arrow
           placement="bottom"
           slotProps={{
             tooltip: {
               sx: (theme) => ({
                 minWidth: '248px',
-                padding: `${theme.spacingFunction(16)} !important`,
+                paddingX: '0 !important',
+                paddingY: `${theme.spacingFunction(16)} !important`,
               }),
             },
           }}