diff --git a/packages/ui-react/src/components/CheckoutForm/__snapshots__/CheckoutForm.test.tsx.snap b/packages/ui-react/src/components/CheckoutForm/__snapshots__/CheckoutForm.test.tsx.snap
index 2c2beb5e7..68dd32a08 100644
--- a/packages/ui-react/src/components/CheckoutForm/__snapshots__/CheckoutForm.test.tsx.snap
+++ b/packages/ui-react/src/components/CheckoutForm/__snapshots__/CheckoutForm.test.tsx.snap
@@ -219,6 +219,7 @@ exports[`<CheckoutForm> > renders and matches snapshot 1`] = `
     <button
       aria-label="common:back"
       class="_iconButton_0fef65 _dialogBackButton_248199"
+      type="button"
     >
       <svg
         aria-hidden="true"
diff --git a/packages/ui-react/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap b/packages/ui-react/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
index fda711396..ca13b6772 100644
--- a/packages/ui-react/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
+++ b/packages/ui-react/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
@@ -38,6 +38,7 @@ exports[`<Dialog> > renders and matches snapshot 1`] = `
             <button
               aria-label="close_modal"
               class="_iconButton_0fef65 _modalCloseButton_b92d69"
+              type="button"
             >
               <svg
                 aria-hidden="true"
diff --git a/packages/ui-react/src/components/DialogBackButton/__snapshots__/DialogBackButton.test.tsx.snap b/packages/ui-react/src/components/DialogBackButton/__snapshots__/DialogBackButton.test.tsx.snap
index 7a39c7d0e..3b86f0b8b 100644
--- a/packages/ui-react/src/components/DialogBackButton/__snapshots__/DialogBackButton.test.tsx.snap
+++ b/packages/ui-react/src/components/DialogBackButton/__snapshots__/DialogBackButton.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`<DialogBackButton> > renders and matches snapshot 1`] = `
   <button
     aria-label="common:back"
     class="_iconButton_0fef65 _dialogBackButton_248199"
+    type="button"
   >
     <svg
       aria-hidden="true"
diff --git a/packages/ui-react/src/components/EditPasswordForm/__snapshots__/EditPasswordForm.test.tsx.snap b/packages/ui-react/src/components/EditPasswordForm/__snapshots__/EditPasswordForm.test.tsx.snap
index 98520e064..6588c0191 100644
--- a/packages/ui-react/src/components/EditPasswordForm/__snapshots__/EditPasswordForm.test.tsx.snap
+++ b/packages/ui-react/src/components/EditPasswordForm/__snapshots__/EditPasswordForm.test.tsx.snap
@@ -42,6 +42,7 @@ exports[`<EditPasswordForm> > renders and matches snapshot 1`] = `
             aria-label="reset.view_password"
             aria-pressed="false"
             class="_iconButton_0fef65"
+            type="button"
           >
             <svg
               aria-hidden="true"
@@ -94,6 +95,7 @@ exports[`<EditPasswordForm> > renders and matches snapshot 1`] = `
             aria-label="reset.view_password"
             aria-pressed="false"
             class="_iconButton_0fef65"
+            type="button"
           >
             <svg
               aria-hidden="true"
diff --git a/packages/ui-react/src/components/Header/__snapshots__/Header.test.tsx.snap b/packages/ui-react/src/components/Header/__snapshots__/Header.test.tsx.snap
index 168f16f1d..38703db9c 100644
--- a/packages/ui-react/src/components/Header/__snapshots__/Header.test.tsx.snap
+++ b/packages/ui-react/src/components/Header/__snapshots__/Header.test.tsx.snap
@@ -23,6 +23,7 @@ exports[`<Header /> > renders header 1`] = `
           aria-haspopup="true"
           aria-label="open_menu"
           class="_iconButton_0fef65 _iconButton_f4f7a7"
+          type="button"
         >
           <svg
             aria-hidden="true"
@@ -51,6 +52,7 @@ exports[`<Header /> > renders header 1`] = `
         <button
           aria-label="Open search"
           class="_iconButton_0fef65 _iconButton_f4f7a7 _actionButton_f4f7a7"
+          type="button"
         >
           <svg
             aria-hidden="true"
diff --git a/packages/ui-react/src/components/IconButton/IconButton.tsx b/packages/ui-react/src/components/IconButton/IconButton.tsx
index 14d229cb7..c03f9c622 100644
--- a/packages/ui-react/src/components/IconButton/IconButton.tsx
+++ b/packages/ui-react/src/components/IconButton/IconButton.tsx
@@ -12,7 +12,7 @@ type Props = ButtonHTMLAttributes<HTMLButtonElement> & {
 
 const IconButton: React.FC<Props> = ({ children, onClick, className, ...ariaProps }: Props) => {
   return (
-    <button className={classNames(styles.iconButton, className)} onClick={onClick} {...ariaProps}>
+    <button className={classNames(styles.iconButton, className)} type="button" onClick={onClick} {...ariaProps}>
       {children}
     </button>
   );
diff --git a/packages/ui-react/src/components/IconButton/__snapshots__/IconButton.test.tsx.snap b/packages/ui-react/src/components/IconButton/__snapshots__/IconButton.test.tsx.snap
index f8e9e64c5..fe9e53ede 100644
--- a/packages/ui-react/src/components/IconButton/__snapshots__/IconButton.test.tsx.snap
+++ b/packages/ui-react/src/components/IconButton/__snapshots__/IconButton.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`<IconButton> > renders and matches snapshot 1`] = `
   <button
     aria-label="Icon button"
     class="_iconButton_0fef65"
+    type="button"
   >
     <svg
       viewBox="0 0 24 24"
diff --git a/packages/ui-react/src/components/LanguageMenu/__snapshots__/LanguageMenu.test.tsx.snap b/packages/ui-react/src/components/LanguageMenu/__snapshots__/LanguageMenu.test.tsx.snap
index 5f70ef66e..5d55ddd6a 100644
--- a/packages/ui-react/src/components/LanguageMenu/__snapshots__/LanguageMenu.test.tsx.snap
+++ b/packages/ui-react/src/components/LanguageMenu/__snapshots__/LanguageMenu.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`<LanguageMenu> > renders and matches snapshot 1`] = `
     aria-label="language_menu"
     class="_iconButton_0fef65"
     data-testid="language-menu-button"
+    type="button"
   >
     <svg
       aria-hidden="true"
diff --git a/packages/ui-react/src/components/LoginForm/__snapshots__/LoginForm.test.tsx.snap b/packages/ui-react/src/components/LoginForm/__snapshots__/LoginForm.test.tsx.snap
index d119863b5..0628874b0 100644
--- a/packages/ui-react/src/components/LoginForm/__snapshots__/LoginForm.test.tsx.snap
+++ b/packages/ui-react/src/components/LoginForm/__snapshots__/LoginForm.test.tsx.snap
@@ -89,6 +89,7 @@ exports[`<LoginForm> > renders and matches snapshot 1`] = `
             aria-label="login.view_password"
             aria-pressed="false"
             class="_iconButton_0fef65"
+            type="button"
           >
             <svg
               aria-hidden="true"
diff --git a/packages/ui-react/src/components/ModalCloseButton/__snapshots__/ModalCloseButton.test.tsx.snap b/packages/ui-react/src/components/ModalCloseButton/__snapshots__/ModalCloseButton.test.tsx.snap
index 3d1e03c3b..6211ad3ab 100644
--- a/packages/ui-react/src/components/ModalCloseButton/__snapshots__/ModalCloseButton.test.tsx.snap
+++ b/packages/ui-react/src/components/ModalCloseButton/__snapshots__/ModalCloseButton.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`<ModalCloseButton> > renders and matches snapshot 1`] = `
   <button
     aria-label="close_modal"
     class="_iconButton_0fef65 _modalCloseButton_b92d69"
+    type="button"
   >
     <svg
       aria-hidden="true"
diff --git a/packages/ui-react/src/components/PasswordField/__snapshots__/PasswordField.test.tsx.snap b/packages/ui-react/src/components/PasswordField/__snapshots__/PasswordField.test.tsx.snap
index c8b995d96..52ffd8085 100644
--- a/packages/ui-react/src/components/PasswordField/__snapshots__/PasswordField.test.tsx.snap
+++ b/packages/ui-react/src/components/PasswordField/__snapshots__/PasswordField.test.tsx.snap
@@ -32,6 +32,7 @@ exports[`<PasswordField> > renders and matches snapshot 1`] = `
           aria-label="reset.view_password"
           aria-pressed="false"
           class="_iconButton_0fef65"
+          type="button"
         >
           <svg
             aria-hidden="true"
diff --git a/packages/ui-react/src/components/RegistrationForm/__snapshots__/RegistrationForm.test.tsx.snap b/packages/ui-react/src/components/RegistrationForm/__snapshots__/RegistrationForm.test.tsx.snap
index 073d957b0..a1cd07919 100644
--- a/packages/ui-react/src/components/RegistrationForm/__snapshots__/RegistrationForm.test.tsx.snap
+++ b/packages/ui-react/src/components/RegistrationForm/__snapshots__/RegistrationForm.test.tsx.snap
@@ -69,6 +69,7 @@ exports[`<RegistrationForm> > renders and matches snapshot 1`] = `
             aria-label="registration.view_password"
             aria-pressed="false"
             class="_iconButton_0fef65"
+            type="button"
           >
             <svg
               aria-hidden="true"
diff --git a/packages/ui-react/src/components/SearchBar/__snapshots__/SearchBar.test.tsx.snap b/packages/ui-react/src/components/SearchBar/__snapshots__/SearchBar.test.tsx.snap
index 6ad06cf58..afe392eb0 100644
--- a/packages/ui-react/src/components/SearchBar/__snapshots__/SearchBar.test.tsx.snap
+++ b/packages/ui-react/src/components/SearchBar/__snapshots__/SearchBar.test.tsx.snap
@@ -35,6 +35,7 @@ exports[`<SearchBar> > renders and matches snapshot 1`] = `
       <button
         aria-label="search_bar.clear_search_label"
         class="_iconButton_0fef65 _clearButton_3bb1d7"
+        type="button"
       >
         <svg
           aria-hidden="true"
diff --git a/packages/ui-react/src/components/Sidebar/__snapshots__/Sidebar.test.tsx.snap b/packages/ui-react/src/components/Sidebar/__snapshots__/Sidebar.test.tsx.snap
index 92a961242..d63f367da 100644
--- a/packages/ui-react/src/components/Sidebar/__snapshots__/Sidebar.test.tsx.snap
+++ b/packages/ui-react/src/components/Sidebar/__snapshots__/Sidebar.test.tsx.snap
@@ -16,6 +16,7 @@ exports[`<SideBar /> > renders sideBar closed 1`] = `
       <button
         aria-label="close_menu"
         class="_iconButton_0fef65"
+        type="button"
       >
         <svg
           aria-hidden="true"
@@ -65,6 +66,7 @@ exports[`<SideBar /> > renders sideBar opened 1`] = `
       <button
         aria-label="close_menu"
         class="_iconButton_0fef65"
+        type="button"
       >
         <svg
           aria-hidden="true"
diff --git a/packages/ui-react/src/components/TextField/TextField.module.scss b/packages/ui-react/src/components/TextField/TextField.module.scss
index a78d12e6a..3457d7ac5 100644
--- a/packages/ui-react/src/components/TextField/TextField.module.scss
+++ b/packages/ui-react/src/components/TextField/TextField.module.scss
@@ -48,7 +48,7 @@
   }
 }
 
-.control > div {
+.control > button {
   width: 48px;
   height: 48px;
 }
diff --git a/packages/ui-react/src/containers/Cinema/__snapshots__/Cinema.test.tsx.snap b/packages/ui-react/src/containers/Cinema/__snapshots__/Cinema.test.tsx.snap
index ae50a64a6..c44677b05 100644
--- a/packages/ui-react/src/containers/Cinema/__snapshots__/Cinema.test.tsx.snap
+++ b/packages/ui-react/src/containers/Cinema/__snapshots__/Cinema.test.tsx.snap
@@ -41,6 +41,7 @@ exports[`<Cinema> > renders and matches snapshot 1`] = `
                   <button
                     aria-label="common:back"
                     class="_iconButton_0fef65 _backButton_555f3c"
+                    type="button"
                   >
                     <svg
                       aria-hidden="true"
diff --git a/packages/ui-react/src/containers/Layout/__snapshots__/Layout.test.tsx.snap b/packages/ui-react/src/containers/Layout/__snapshots__/Layout.test.tsx.snap
index d625ee018..6d3935d97 100644
--- a/packages/ui-react/src/containers/Layout/__snapshots__/Layout.test.tsx.snap
+++ b/packages/ui-react/src/containers/Layout/__snapshots__/Layout.test.tsx.snap
@@ -27,6 +27,7 @@ exports[`<Layout /> > renders layout 1`] = `
               aria-haspopup="true"
               aria-label="open_menu"
               class="_iconButton_0fef65 _iconButton_f4f7a7"
+              type="button"
             >
               <svg
                 aria-hidden="true"
@@ -82,6 +83,7 @@ exports[`<Layout /> > renders layout 1`] = `
         <button
           aria-label="close_menu"
           class="_iconButton_0fef65"
+          type="button"
         >
           <svg
             aria-hidden="true"