diff --git a/web/components/tipper.tsx b/web/components/tipper.tsx
index 68ca5308..1c76c3e7 100644
--- a/web/components/tipper.tsx
+++ b/web/components/tipper.tsx
@@ -37,7 +37,7 @@ export function Tipper(prop: { comment: Comment; tips: CommentTips }) {
 
   // declare debounced function only on first render
   const [saveTip] = useState(() =>
-    debounce(async (user: User, change: number) => {
+    debounce(async (user: User, comment: Comment, change: number) => {
       if (change === 0) {
         return
       }
@@ -71,30 +71,24 @@ export function Tipper(prop: { comment: Comment; tips: CommentTips }) {
   // instant save on unrender
   useEffect(() => () => void saveTip.flush(), [saveTip])
 
-  const changeTip = (tip: number) => {
-    setLocalTip(tip)
-    me && saveTip(me, tip - savedTip)
+  const addTip = (delta: number) => {
+    setLocalTip(localTip + delta)
+    me && saveTip(me, comment, localTip - savedTip + delta)
   }
 
+  const canDown = me && localTip > savedTip
+  const canUp = me && me.id !== comment.userId && me.balance >= localTip + 5
   return (
     <Row className="items-center gap-0.5">
-      <DownTip
-        value={localTip}
-        onChange={changeTip}
-        disabled={!me || localTip <= savedTip}
-      />
+      <DownTip onClick={canDown ? () => addTip(-5) : undefined} />
       <span className="font-bold">{Math.floor(total)}</span>
-      <UpTip
-        value={localTip}
-        onChange={changeTip}
-        disabled={!me || me.id === comment.userId || me.balance < localTip + 5}
-      />
+      <UpTip onClick={canUp ? () => addTip(+5) : undefined} value={localTip} />
       {localTip === 0 ? (
         ''
       ) : (
         <span
           className={clsx(
-            'font-semibold',
+            'ml-1 font-semibold',
             localTip > 0 ? 'text-primary' : 'text-red-400'
           )}
         >
@@ -105,21 +99,17 @@ export function Tipper(prop: { comment: Comment; tips: CommentTips }) {
   )
 }
 
-function DownTip(prop: {
-  value: number
-  onChange: (tip: number) => void
-  disabled?: boolean
-}) {
-  const { onChange, value, disabled } = prop
+function DownTip(props: { onClick?: () => void }) {
+  const { onClick } = props
   return (
     <Tooltip
-      className="tooltip-bottom"
-      text={!disabled && `-${formatMoney(5)}`}
+      className="tooltip-bottom h-6 w-6"
+      text={onClick && `-${formatMoney(5)}`}
     >
       <button
-        className="flex h-max items-center hover:text-red-600 disabled:text-gray-300"
-        disabled={disabled}
-        onClick={() => onChange(value - 5)}
+        className="hover:text-red-600 disabled:text-gray-300"
+        disabled={!onClick}
+        onClick={onClick}
       >
         <ChevronLeftIcon className="h-6 w-6" />
       </button>
@@ -127,30 +117,20 @@ function DownTip(prop: {
   )
 }
 
-function UpTip(prop: {
-  value: number
-  onChange: (tip: number) => void
-  disabled?: boolean
-}) {
-  const { onChange, value, disabled } = prop
-
+function UpTip(props: { onClick?: () => void; value: number }) {
+  const { onClick, value } = props
+  const IconKind = value >= 10 ? ChevronDoubleRightIcon : ChevronRightIcon
   return (
     <Tooltip
-      className="tooltip-bottom"
-      text={!disabled && `Tip ${formatMoney(5)}`}
+      className="tooltip-bottom h-6 w-6"
+      text={onClick && `Tip ${formatMoney(5)}`}
     >
       <button
-        className="hover:text-primary flex h-max items-center disabled:text-gray-300"
-        disabled={disabled}
-        onClick={() => onChange(value + 5)}
+        className="hover:text-primary disabled:text-gray-300"
+        disabled={!onClick}
+        onClick={onClick}
       >
-        {value >= 10 ? (
-          <ChevronDoubleRightIcon className="text-primary mx-1 h-6 w-6" />
-        ) : value > 0 ? (
-          <ChevronRightIcon className="text-primary h-6 w-6" />
-        ) : (
-          <ChevronRightIcon className="h-6 w-6" />
-        )}
+        <IconKind className={clsx('h-6 w-6', value ? 'text-primary' : '')} />
       </button>
     </Tooltip>
   )