diff --git a/src/features/zap/components/zap-pay-request-form.tsx b/src/features/zap/components/zap-pay-request-form.tsx
index 67b855b3b..17b323fdf 100644
--- a/src/features/zap/components/zap-pay-request-form.tsx
+++ b/src/features/zap/components/zap-pay-request-form.tsx
@@ -15,7 +15,8 @@ interface IZapPayRequestForm {
 }
 
 const messages = defineMessages({
-  zap_button: { id: 'status.zap', defaultMessage: 'Zap' },
+  zap_button_rounded: { id: 'zap.button.text.rounded', defaultMessage: 'Zap' },
+  zap_button: { id: 'zap.button.text.raw', defaultMessage: 'Zap' },
   zap_commentPlaceholder: { id: 'zap.comment_input.placeholder', defaultMessage: 'Optional comment' },
 });
 
@@ -23,11 +24,13 @@ const ZapPayRequestForm = ({ account, status }: IZapPayRequestForm) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
   const [zapComment, setZapComment] = useState('');
-  const [zapAmount, setZapAmount] = useState(500);
+  // amount in millisatoshi
+  const [zapAmount, setZapAmount] = useState(50);
 
   const handleSubmit = async (e?: React.FormEvent<Element>) => {
     e?.preventDefault();
     if (status) {
+      // multiply by 1000 to convert from satoshi to millisatoshi
       const invoice = await dispatch(zap(status, zapAmount * 1000, zapComment));
       // If invoice is undefined it means the user has paid through his extension
       // In this case, we simply close the modal
@@ -40,26 +43,45 @@ const ZapPayRequestForm = ({ account, status }: IZapPayRequestForm) => {
     }
   };
 
+  const handleCustomAmount = (e: React.ChangeEvent<HTMLInputElement>) => {
+    e?.preventDefault();
+    const inputAmount = e.target.value.replace(/[^0-9]/g, '');
+
+    const maxSendable = 250000000;
+    // multiply by 1000 to convert from satoshi to millisatoshi
+    if (maxSendable * 1000 > Number(inputAmount)) {
+      setZapAmount(Number(inputAmount));
+    }
+  };
+
+  const renderZapButtonText = () => {
+    if (zapAmount >= 1000) {
+      return intl.formatMessage(messages.zap_button_rounded, { amount: Math.round((zapAmount / 1000) * 10) / 10 });
+    }
+    return intl.formatMessage(messages.zap_button, { amount: zapAmount });
+  };
+
   return (
     <Stack space={3} element='form' onSubmit={handleSubmit}>
       <Account account={account} showProfileHoverCard={false} />
-
-      <div className='flex justify-center'>
-        <Input type='text' min={1} value={zapAmount} className='lg border-ul max-w-20 border-neutral-200 bg-inherit pb-1 text-center text-3xl font-bold outline-none focus:ring-0' />
+      <div>
         <FormattedMessage id='zap.unit' defaultMessage='Zap amount in sats' />
       </div>
 
       <div className='flex justify-center '>
-        <Button onClick={_ => setZapAmount(1)} className='m-1' type='button' theme='muted' text='😐 1' />
-        <Button onClick={_ => setZapAmount(500)} className='m-1' type='button' theme='primary' text='👍 500' />
-        <Button onClick={_ => setZapAmount(666)} className='m-1' type='button' theme='muted'  text='😈 666' />
-        <Button onClick={_ => setZapAmount(1000)} className='m-1' type='button' theme='muted' text='🚀 1K' />
+        <Button onClick={_ => setZapAmount(50)} className='m-1' type='button' theme={zapAmount === 50 ? 'primary' : 'muted'} text='👍 50' />
+        <Button onClick={_ => setZapAmount(200)} className='m-1' type='button' theme={zapAmount === 200 ? 'primary' : 'muted'} text='🩵  200' />
+        <Button onClick={_ => setZapAmount(1_000)} className='m-1' type='button' theme={zapAmount === 1_000 ? 'primary' : 'muted'} text='🤩 1K' />
+        <Button onClick={_ => setZapAmount(3_000)} className='m-1' type='button' theme={zapAmount === 3_000 ? 'primary' : 'muted'} text='🔥 3K' />
+        <Button onClick={_ => setZapAmount(5_000)} className='m-1' type='button' theme={zapAmount === 5_000 ? 'primary' : 'muted'} text='🧙 5K' />
       </div>
 
-      <div className='flex w-full'>
-        <Input className='w-10/12' onChange={e => setZapComment(e.target.value)} type='text' placeholder={intl.formatMessage(messages.zap_commentPlaceholder)} />
-        <Button type='submit' theme='primary' icon={require('@tabler/icons/outline/bolt.svg')} text={intl.formatMessage(messages.zap_button)} />
+      <div className='flex justify-center'>
+        <Input type='text' onChange={handleCustomAmount} value={zapAmount} className='border-ul max-w-28 border-neutral-200 p-0.5 text-center font-bold outline-none focus:ring-0 sm:text-2xl dark:bg-transparent' />
       </div>
+
+      <Input onChange={e => setZapComment(e.target.value)} type='text' placeholder={intl.formatMessage(messages.zap_commentPlaceholder)} />
+      <Button className='m-auto w-auto shadow-[0_4px_rgba(18,95,139,1)]' type='submit' theme='primary' icon={require('@tabler/icons/outline/bolt.svg')} text={renderZapButtonText()} disabled={zapAmount < 1 ? true : false} />
     </Stack>
   );
 };