diff --git a/components/Button.tsx b/components/Button.tsx
index 2520186..e8f2bf1 100644
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -1,42 +1,28 @@
 interface ButtonProps {
   text?: string,
   icon?: string,
-  onClick?: () => void,
   loading?: boolean,
-  type?: ButtonType,
-}
-
-export enum ButtonType {
-    submit = 'submit',
-    button = 'button',
-}
-
-Button.defaultProps = {
-    loading: false,
-    type: ButtonType.button,
+  onClick: () => void,
 }
 
 function Button(props: ButtonProps): JSX.Element {
+
+    function handleTouchEnd(event: React.TouchEvent<HTMLButtonElement>) {
+        event.preventDefault();
+        event.stopPropagation();
+        
+        props.onClick();
+    }
+
     return (
         <button
-            type={props.type}
-            onMouseUp={props.onClick}
-            onTouchEnd={props.onClick}
-            className={`${props.type == ButtonType.submit ? "bg-green-600 hover:bg-green-700" : "bg-gray-400 dark:bg-gray-600 hover:bg-gray-500"} relative focus:outline-none h-20 text-white font-semibold rounded-md items-center flex justify-center`}>
+            type="button"
+            onClick={props.onClick}
+            onTouchEnd={handleTouchEnd}
+            className="bg-gray-400 dark:bg-gray-600 hover:bg-gray-500 relative focus:outline-none h-20 text-white font-semibold rounded-md items-center flex justify-center">
             {
                 props.icon && <img src={props.icon} className="w-12 h-12 mr-2 -ml-4" />
             }
-            {
-                props.type == ButtonType.submit &&
-                <div id="spin" className={`${props.loading ? undefined : "hidden"} absolute left-2`}>
-                    <svg className="animate-spin h-5 w-5 ml-4" viewBox="0 0 24 24">
-                        <circle className="opacity-0" cx="12" cy="12" r="10" stroke="currentColor"
-                                strokeWidth="4"/>
-                        <path className="opacity-80" fill="currentColor"
-                            d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"/>
-                    </svg>
-                </div>
-            }
             {props.text}
         </button>
     )
diff --git a/components/Form.tsx b/components/Form.tsx
index 7cb9937..0261e64 100644
--- a/components/Form.tsx
+++ b/components/Form.tsx
@@ -13,7 +13,7 @@ import {getPayloadBodyFromFile, getPayloadBodyFromQR} from "../src/process";
 import {PassData} from "../src/pass";
 import {COLORS} from "../src/colors";
 import Colors from './Colors';
-import Button, { ButtonType } from './Button';
+import Button from './Button';
 
 function Form(): JSX.Element {
     const {t} = useTranslation(['index', 'errors', 'common']);
@@ -278,7 +278,19 @@ function Form(): JSX.Element {
                             </p>
                         </label>
                         <div className="grid grid-cols-1">
-                            <Button type={ButtonType.submit} text={t('index:addToWallet')} loading={loading} />
+                            <button 
+                                type="submit"
+                                className="bg-green-600 hover:bg-green-700 relative focus:outline-none h-20 text-white font-semibold rounded-md items-center flex justify-center">
+                                <div id="spin" className={`${loading ? undefined : "hidden"} absolute left-2`}>
+                                    <svg className="animate-spin h-5 w-5 ml-4" viewBox="0 0 24 24">
+                                        <circle className="opacity-0" cx="12" cy="12" r="10" stroke="currentColor"
+                                                strokeWidth="4"/>
+                                        <path className="opacity-80" fill="currentColor"
+                                            d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"/>
+                                    </svg>
+                                </div>
+                                {t('index:addToWallet')}
+                            </button>
                         </div>
                     </div>
                 }/>