diff --git a/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTile.tsx b/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTile.tsx
index 88c2c87c8f..a2575eceda 100644
--- a/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTile.tsx
+++ b/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTile.tsx
@@ -59,7 +59,6 @@ const MultisigSignerTile: React.FC<{
 
   return (
     <MultisigSignerTileDisplay
-      pkh={signerAddress.pkh}
       addressKind={addressKind}
       signerState={getMultisigSignerState({
         approvals: operation.approvals,
diff --git a/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTileDisplay.test.tsx b/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTileDisplay.test.tsx
index 8582b5ca63..79d4ef9b17 100644
--- a/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTileDisplay.test.tsx
+++ b/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTileDisplay.test.tsx
@@ -6,17 +6,15 @@ import { MultisigSignerTileDisplay } from "./MultisigSignerTileDisplay";
 
 const pkh = mockImplicitAccount(0).address.pkh;
 const label = "my label";
+const shrinkedAddress = formatPkh(pkh);
 
 describe("<MultisigSignerTileDisplay />", () => {
-  const shrinkedAddress = formatPkh(pkh);
   it("renders the right icon with a shrinked address and label l for known addresses", () => {
     render(
       <MultisigSignerTileDisplay
-        kind="contact"
-        pkh={pkh}
+        addressKind={{ type: "contact", pkh, label }}
         signerState="approvable"
         onClickApproveExecute={() => {}}
-        label={label}
       />
     );
     expect(screen.getByTestId("contact-icon")).toBeInTheDocument();
@@ -26,11 +24,9 @@ describe("<MultisigSignerTileDisplay />", () => {
     cleanup();
     render(
       <MultisigSignerTileDisplay
-        kind={AccountType.LEDGER}
-        pkh={pkh}
+        addressKind={{ type: AccountType.LEDGER, pkh, label }}
         signerState="approvable"
         onClickApproveExecute={() => {}}
-        label={label}
       />
     );
     expect(screen.getByTestId("ledger-icon")).toBeInTheDocument();
@@ -40,11 +36,9 @@ describe("<MultisigSignerTileDisplay />", () => {
     cleanup();
     render(
       <MultisigSignerTileDisplay
-        kind={AccountType.MNEMONIC}
-        pkh={pkh}
+        addressKind={{ type: "mnemonic", pkh, label }}
         signerState="approvable"
         onClickApproveExecute={() => {}}
-        label={label}
       />
     );
     expect(screen.getByTestId("identicon")).toBeInTheDocument();
@@ -54,11 +48,9 @@ describe("<MultisigSignerTileDisplay />", () => {
     cleanup();
     render(
       <MultisigSignerTileDisplay
-        kind={AccountType.SOCIAL}
-        pkh={pkh}
+        addressKind={{ type: "social", pkh, label }}
         signerState="approvable"
         onClickApproveExecute={() => {}}
-        label={label}
       />
     );
     expect(screen.getByTestId("social-icon")).toBeInTheDocument();
@@ -66,14 +58,12 @@ describe("<MultisigSignerTileDisplay />", () => {
     expect(screen.getByText(label)).toBeInTheDocument();
   });
 
-  it("renders the right icon with no label for unknown addresses", () => {
+  it("renders the right icon and no label for unknown addresses", () => {
     render(
       <MultisigSignerTileDisplay
-        kind="unknown"
-        pkh={pkh}
+        addressKind={{ type: "unknown", pkh, label: null }}
         signerState="approvable"
         onClickApproveExecute={() => {}}
-        label={label}
       />
     );
     expect(screen.getByTestId("unknown-contact-icon")).toBeInTheDocument();
diff --git a/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTileDisplay.tsx b/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTileDisplay.tsx
index ee37488922..74157242a9 100644
--- a/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTileDisplay.tsx
+++ b/src/components/AccountDrawer/AssetsPanel/MultisigPendingAccordion/MultisigSignerTileDisplay.tsx
@@ -6,16 +6,15 @@ import { AddressKind } from "../../../AddressTile/types";
 import AccountTileIcon from "../../../AccountTile/AccountTileIcon";
 
 export const MultisigSignerTileDisplay: React.FC<{
-  pkh: string;
   onClickApproveExecute: () => void;
   signerState: MultisigSignerState;
   isLoading?: boolean;
   addressKind: Exclude<AddressKind, AccountType.MULTISIG>;
-}> = ({ pkh, isLoading = false, addressKind, ...rest }) => {
+}> = ({ isLoading = false, addressKind, ...rest }) => {
   return (
     <AccountTileBase
       icon={<AccountTileIcon addressKind={addressKind} />}
-      leftElement={<LabelAndAddress label={addressKind.label} pkh={pkh} />}
+      leftElement={<LabelAndAddress label={addressKind.label} pkh={addressKind.pkh} />}
       rightElement={<MultisigActionButton isLoading={isLoading} {...rest} />}
     />
   );
diff --git a/src/components/AccountTile/AccountTileDisplay.stories.tsx b/src/components/AccountTile/AccountTileDisplay.stories.tsx
deleted file mode 100644
index 241bc22aec..0000000000
--- a/src/components/AccountTile/AccountTileDisplay.stories.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-// import React from "react";
-// import { ComponentStory, ComponentMeta } from "@storybook/react";
-// import { AccountTileDisplay } from "./AccountTileDisplay";
-// import { AccountType } from "../../types/Account";
-
-// export default {
-//   title: "Umami/AccountTileDisplay",
-//   component: AccountTileDisplay,
-// } as ComponentMeta<typeof AccountTileDisplay>;
-
-// const Template: ComponentStory<typeof AccountTileDisplay> = args => (
-//   <AccountTileDisplay {...args} />
-// );
-
-// export const Default = Template.bind({});
-// Default.args = {
-//   label: "My super account",
-//   address: "tz1UNer1ijeE9ndjzSszRduR3CzX49hoBUB3",
-//   balance: "34,12 tez",
-//   kind: AccountType.MNEMONIC,
-// };
-
-// export const Multisig = Template.bind({});
-// Multisig.args = {
-//   label: "My super account",
-//   address: "tz1UNer1ijeE9ndjzSszRduR3CzX49hoBUB3",
-//   balance: "34,12 tez",
-//   kind: AccountType.MULTISIG,
-// };
-
-// export const Social = Template.bind({});
-// Social.args = {
-//   label: "My super account",
-//   address: "tz1UNer1ijeE9ndjzSszRduR3CzX49hoBUB3",
-//   balance: "34,12 tez",
-//   kind: AccountType.SOCIAL,
-// };
-// export const Ledger = Template.bind({});
-// Ledger.args = {
-//   label: "My super account",
-//   address: "tz1UNer1ijeE9ndjzSszRduR3CzX49hoBUB3",
-//   balance: "34,12 tez",
-//   kind: AccountType.LEDGER,
-// };
-
-// export const Selected = Template.bind({});
-// Selected.args = {
-//   ...Default.args,
-//   selected: true,
-// };
diff --git a/src/components/AccountTile/AccountTileDisplay.tsx b/src/components/AccountTile/AccountTileDisplay.tsx
index c64c0c7841..40c9aad1d9 100644
--- a/src/components/AccountTile/AccountTileDisplay.tsx
+++ b/src/components/AccountTile/AccountTileDisplay.tsx
@@ -42,7 +42,10 @@ export const AccountTileBase: React.FC<
   );
 };
 
-export const LabelAndAddress: React.FC<{ label?: string; pkh: string }> = ({ label, pkh }) => {
+export const LabelAndAddress: React.FC<{ label: string | null; pkh: string }> = ({
+  label,
+  pkh,
+}) => {
   return (
     <Box m={4} data-testid="account-identifier">
       {label && <Heading size="md">{label}</Heading>}