diff --git a/packages/pn-commons/src/components/CodeModal/CodeInput.tsx b/packages/pn-commons/src/components/CodeModal/CodeInput.tsx
index 838c753c0..4f01c1407 100644
--- a/packages/pn-commons/src/components/CodeModal/CodeInput.tsx
+++ b/packages/pn-commons/src/components/CodeModal/CodeInput.tsx
@@ -12,6 +12,8 @@ import {
 
 import { TextField } from '@mui/material';
 
+import { getLocalizedOrDefaultLabel } from '../../utility/localization.utility';
+
 type Props = {
   initialValues: Array<string>;
   onChange: (values: Array<string>) => void;
@@ -126,13 +128,15 @@ const CodeInput = ({ initialValues, isReadOnly, hasError, onChange }: Props) =>
     onChange(currentValues);
   }, [currentValues]);
 
-  const cifre = ['primo', 'secondo', 'terzo', 'quarto', 'ultimo'];
+  const digits = getLocalizedOrDefaultLabel('common', 'code-modal.digits', undefined, {
+    returnObjects: true,
+  });
 
   return (
     <Fragment>
       {initialValues.map((_value, index) => (
         <TextField
-          aria-label={`input numero ${cifre[index]}`}
+          aria-label={`${digits[index]}`}
           data-testid={`codeInput(${index})`}
           autoComplete="off"
           key={index}
diff --git a/packages/pn-commons/src/components/CodeModal/CodeModal.tsx b/packages/pn-commons/src/components/CodeModal/CodeModal.tsx
index 5468ffbcd..9fff109dd 100644
--- a/packages/pn-commons/src/components/CodeModal/CodeModal.tsx
+++ b/packages/pn-commons/src/components/CodeModal/CodeModal.tsx
@@ -27,8 +27,8 @@ type Props = {
   codeSectionTitle: string;
   codeSectionAdditional?: ReactNode;
   confirmLabel?: string;
-  cancelLabel?: string;
-  cancelCallback?: () => void;
+  cancelLabel: string;
+  cancelCallback: () => void;
   confirmCallback?: (values: Array<string>) => void;
   isReadOnly?: boolean;
   error?: { title: string; message: string; hasError: boolean };
@@ -38,24 +38,6 @@ type ModalHandle = {
   updateError: (error: ErrorMessage, codeNotValid: boolean) => void;
 };
 
-const RenderCopyToClipboardButton: React.FC<{
-  isReadOnly: boolean;
-  initialValues: Array<string>;
-}> = ({ isReadOnly, initialValues }) =>
-  isReadOnly && (
-    <CopyToClipboardButton
-      id="copy-code-button"
-      data-testid="copyCodeButton"
-      sx={{ mt: 1.5 }}
-      value={initialValues.join('')}
-      tooltipTitle={getLocalizedOrDefaultLabel(
-        'delegations',
-        'deleghe.code_copied',
-        'Codice copiato'
-      )}
-    />
-  );
-
 /**
  * This modal allows the user to input a verification code.
  * @param title title to show
@@ -140,7 +122,7 @@ const CodeModal = forwardRef<ModalHandle, Props>(
     return (
       <PnDialog
         open={open}
-        aria-labelledby={code.length ? 'dialog-title' : ''}
+        aria-labelledby="dialog-title"
         aria-describedby="dialog-description"
         data-testid="codeDialog"
         disableEscapeKeyDown
@@ -154,7 +136,6 @@ const CodeModal = forwardRef<ModalHandle, Props>(
           <Typography fontSize={16} fontWeight={600}>
             {codeSectionTitle}
           </Typography>
-          {codeSectionAdditional && <Box sx={{ mt: 2 }}>{codeSectionAdditional}</Box>}
           <Box sx={{ mt: 2 }}>
             <CodeInput
               initialValues={initialValues}
@@ -162,8 +143,17 @@ const CodeModal = forwardRef<ModalHandle, Props>(
               hasError={internalHasError}
               onChange={changeHandler}
             />
+            {isReadOnly && (
+              <CopyToClipboardButton
+                id="copy-code-button"
+                data-testid="copyCodeButton"
+                sx={{ mt: 1.5 }}
+                value={initialValues.join('')}
+                tooltipTitle={getLocalizedOrDefaultLabel('delegations', 'deleghe.code_copied')}
+              />
+            )}
           </Box>
-          <RenderCopyToClipboardButton initialValues={initialValues} isReadOnly={isReadOnly} />
+          {codeSectionAdditional && <Box sx={{ mt: 2 }}>{codeSectionAdditional}</Box>}
           {internalHasError && (
             <Alert id="error-alert" data-testid="errorAlert" severity="error" sx={{ mt: 2 }}>
               <AlertTitle id="codeModalErrorTitle" data-testid="CodeModal error title">
@@ -174,16 +164,14 @@ const CodeModal = forwardRef<ModalHandle, Props>(
           )}
         </PnDialogContent>
         <PnDialogActions>
-          {cancelLabel && cancelCallback && (
-            <Button
-              id="code-cancel-button"
-              variant="outlined"
-              onClick={cancelCallback}
-              data-testid="codeCancelButton"
-            >
-              {cancelLabel}
-            </Button>
-          )}
+          <Button
+            id="code-cancel-button"
+            variant="outlined"
+            onClick={cancelCallback}
+            data-testid="codeCancelButton"
+          >
+            {cancelLabel}
+          </Button>
           {confirmLabel && confirmCallback && (
             <Button
               id="code-confirm-button"
diff --git a/packages/pn-commons/src/components/CodeModal/__test__/CodeInput.test.tsx b/packages/pn-commons/src/components/CodeModal/__test__/CodeInput.test.tsx
index 941d4e38e..1e7dcc6b4 100644
--- a/packages/pn-commons/src/components/CodeModal/__test__/CodeInput.test.tsx
+++ b/packages/pn-commons/src/components/CodeModal/__test__/CodeInput.test.tsx
@@ -79,37 +79,26 @@ describe('CodeInput Component', () => {
       <CodeInput initialValues={new Array(5).fill('')} onChange={handleChangeMock} />
     );
     const codeInputs = getAllByTestId(/code-input-[0-4]/);
+    // focus on the input
+    act(() => (codeInputs[2] as HTMLInputElement).focus());
     fireEvent.change(codeInputs[2], { target: { value: '3' } });
     expect(codeInputs[2]).toHaveValue('3');
+    await waitFor(() => {
+      expect(handleChangeMock).toHaveBeenCalledTimes(2);
+    });
     // change the value of the input and check that it is updated correctly
-    // set the cursor position to the end
-    act(() => (codeInputs[2] as HTMLInputElement).focus());
-    (codeInputs[2] as HTMLInputElement).setSelectionRange(1, 1);
     // when we try to edit an input, we insert a second value and after, based on cursor position, we change the value
     // we must use userEvent because the keyboard event must trigger also the change event (fireEvent doesn't do that)
     await user.keyboard('4');
-
-    act(() => (codeInputs[3] as HTMLInputElement).focus());
-    await waitFor(() => {
-      expect(codeInputs[3]).toHaveFocus();
-    });
     await waitFor(() => {
       expect(codeInputs[2]).toHaveValue('4');
     });
-    // move the cursor at the start of the input and try to edit again
-    act(() => (codeInputs[2] as HTMLInputElement).focus());
-    (codeInputs[2] as HTMLInputElement).setSelectionRange(0, 0);
+    // try to edit again
     await user.keyboard('3');
-
-    act(() => (codeInputs[3] as HTMLInputElement).focus());
-    await waitFor(() => {
-      expect(codeInputs[3]).toHaveFocus();
-    });
     await waitFor(() => {
       expect(codeInputs[2]).toHaveValue('3');
     });
     // delete the value
-    act(() => (codeInputs[2] as HTMLInputElement).focus());
     await user.keyboard('{Backspace}');
     await waitFor(() => {
       expect(codeInputs[2]).toHaveValue('');
diff --git a/packages/pn-commons/src/components/CodeModal/__test__/CodeModal.test.tsx b/packages/pn-commons/src/components/CodeModal/__test__/CodeModal.test.tsx
index e1f45e734..5786fb385 100644
--- a/packages/pn-commons/src/components/CodeModal/__test__/CodeModal.test.tsx
+++ b/packages/pn-commons/src/components/CodeModal/__test__/CodeModal.test.tsx
@@ -110,7 +110,7 @@ describe('CodeModal Component', () => {
     const button = within(dialog).getByTestId('codeCancelButton');
     fireEvent.click(button);
     await waitFor(() => {
-      expect(cancelButtonMock).toBeCalledTimes(1);
+      expect(cancelButtonMock).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -132,8 +132,8 @@ describe('CodeModal Component', () => {
       expect(button).toBeEnabled();
     });
     fireEvent.click(button);
-    expect(confirmButtonMock).toBeCalledTimes(1);
-    expect(confirmButtonMock).toBeCalledWith(['0', '1', '2', '3', '4']);
+    expect(confirmButtonMock).toHaveBeenCalledTimes(1);
+    expect(confirmButtonMock).toHaveBeenCalledWith(['0', '1', '2', '3', '4']);
   });
 
   it('shows error', () => {
diff --git a/packages/pn-personafisica-webapp/public/locales/it/common.json b/packages/pn-personafisica-webapp/public/locales/it/common.json
index 7f38bd5bd..fecb2fe25 100644
--- a/packages/pn-personafisica-webapp/public/locales/it/common.json
+++ b/packages/pn-personafisica-webapp/public/locales/it/common.json
@@ -198,5 +198,8 @@
     "title": "Vuoi davvero uscire da SEND?",
     "body": "La disconnessione è in corso. Se hai cambiato idea premi “Mantieni l’accesso” entro pochi secondi.",
     "action": "Mantieni l’accesso"
+  },
+  "code-modal": {
+    "digits": ["prima cifra", "seconda cifra", "terza cifra", "quarta cifra", "ultima cifra"]
   }
 }
diff --git a/packages/pn-personafisica-webapp/src/components/Contacts/ContactCodeDialog.tsx b/packages/pn-personafisica-webapp/src/components/Contacts/ContactCodeDialog.tsx
index a0c15f479..4e99cb030 100644
--- a/packages/pn-personafisica-webapp/src/components/Contacts/ContactCodeDialog.tsx
+++ b/packages/pn-personafisica-webapp/src/components/Contacts/ContactCodeDialog.tsx
@@ -3,6 +3,7 @@ import { Trans, useTranslation } from 'react-i18next';
 
 import { Box, Typography } from '@mui/material';
 import { AppResponse, AppResponsePublisher, CodeModal, ErrorMessage } from '@pagopa-pn/pn-commons';
+import { ButtonNaked } from '@pagopa/mui-italia';
 
 import { AddressType, ChannelType } from '../../models/contacts';
 
@@ -78,15 +79,19 @@ const ContactCodeDialog: React.FC<Props> = ({
               i18nKey={`${labelRoot}.${contactType}-new-code`}
               ns="recapiti"
               components={[
-                <Typography
+                <ButtonNaked
                   key="newCodeBtn"
-                  role="button"
-                  tabIndex={0}
-                  variant="body2"
+                  size="medium"
                   onClick={() => onConfirm()}
                   color="primary"
-                  sx={{ textDecoration: 'underline', display: 'inline', cursor: 'pointer' }}
+                  sx={{
+                    textDecoration: 'underline',
+                    display: 'inline',
+                    fontWeight: 400,
+                    verticalAlign: 'baseline',
+                  }}
                   data-testid="newCodeBtn"
+                  component={Typography}
                 />,
               ]}
             />
diff --git a/packages/pn-personagiuridica-webapp/public/locales/it/common.json b/packages/pn-personagiuridica-webapp/public/locales/it/common.json
index 7ae65a4bd..098bf870e 100644
--- a/packages/pn-personagiuridica-webapp/public/locales/it/common.json
+++ b/packages/pn-personagiuridica-webapp/public/locales/it/common.json
@@ -211,5 +211,8 @@
     "title": "Vuoi davvero uscire da SEND?",
     "body": "La disconnessione è in corso. Se hai cambiato idea premi “Mantieni l’accesso” entro pochi secondi.",
     "action": "Mantieni l’accesso"
+  },
+  "code-modal": {
+    "digits": ["prima cifra", "seconda cifra", "terza cifra", "quarta cifra", "ultima cifra"]
   }
 }
diff --git a/packages/pn-personagiuridica-webapp/src/components/Contacts/ContactCodeDialog.tsx b/packages/pn-personagiuridica-webapp/src/components/Contacts/ContactCodeDialog.tsx
index 0e8c65e70..bc0d1c04a 100644
--- a/packages/pn-personagiuridica-webapp/src/components/Contacts/ContactCodeDialog.tsx
+++ b/packages/pn-personagiuridica-webapp/src/components/Contacts/ContactCodeDialog.tsx
@@ -3,6 +3,7 @@ import { Trans, useTranslation } from 'react-i18next';
 
 import { Box, Typography } from '@mui/material';
 import { AppResponse, AppResponsePublisher, CodeModal, ErrorMessage } from '@pagopa-pn/pn-commons';
+import { ButtonNaked } from '@pagopa/mui-italia';
 
 import { AddressType, ChannelType } from '../../models/contacts';
 
@@ -25,8 +26,9 @@ const ContactCodeDialog: React.FC<Props> = ({
 }) => {
   const { t } = useTranslation(['common', 'recapiti']);
   const contactType = channelType.toLowerCase();
-  const codeModalRef =
-    useRef<{ updateError: (error: ErrorMessage, codeNotValid: boolean) => void }>(null);
+  const codeModalRef = useRef<{
+    updateError: (error: ErrorMessage, codeNotValid: boolean) => void;
+  }>(null);
   const labelRoot = `${addressType.toLowerCase()}-contacts`;
 
   const handleAddressUpdateError = useCallback(
@@ -74,13 +76,19 @@ const ContactCodeDialog: React.FC<Props> = ({
               i18nKey={`${labelRoot}.${contactType}-new-code`}
               ns="recapiti"
               components={[
-                <Typography
+                <ButtonNaked
                   key="newCodeBtn"
-                  variant="body2"
+                  size="medium"
                   onClick={() => onConfirm()}
                   color="primary"
-                  sx={{ textDecoration: 'underline', display: 'inline', cursor: 'pointer' }}
+                  sx={{
+                    textDecoration: 'underline',
+                    display: 'inline',
+                    fontWeight: 400,
+                    verticalAlign: 'baseline',
+                  }}
                   data-testid="newCodeBtn"
+                  component={Typography}
                 />,
               ]}
             />