diff --git a/apps/client/src/widgets/collections/calendar/index.tsx b/apps/client/src/widgets/collections/calendar/index.tsx
index 306b86689..acae174e5 100644
--- a/apps/client/src/widgets/collections/calendar/index.tsx
+++ b/apps/client/src/widgets/collections/calendar/index.tsx
@@ -340,18 +340,13 @@ function CalendarTouchBar({ calendarRef }: { calendarRef: RefObject<FullCalendar
                 label={t("calendar.today")}
                 click={() => calendarRef.current?.today()}
             />
-            <TouchBarSegmentedControl
-                mode="buttons"
-                segments={[
-                    {
-                        icon: "NSImageNameTouchBarGoBackTemplate",
-                        onClick: () => calendarRef.current?.prev()
-                    },
-                    {
-                        icon: "NSImageNameTouchBarGoForwardTemplate",
-                        onClick: () => calendarRef.current?.next()
-                    }
-                ]}
+            <TouchBarButton
+                icon="NSImageNameTouchBarGoBackTemplate"
+                click={() => calendarRef.current?.prev()}
+            />
+            <TouchBarButton
+                icon="NSImageNameTouchBarGoForwardTemplate"
+                click={() => calendarRef.current?.next()}
             />
         </TouchBar>
     );
diff --git a/apps/client/src/widgets/react/TouchBar.tsx b/apps/client/src/widgets/react/TouchBar.tsx
index 42b6c2da9..c16e8a74f 100644
--- a/apps/client/src/widgets/react/TouchBar.tsx
+++ b/apps/client/src/widgets/react/TouchBar.tsx
@@ -21,7 +21,8 @@ interface SliderProps {
 }
 
 interface ButtonProps {
-    label: string;
+    label?: string;
+    icon?: string;
     click: () => void;
     enabled?: boolean;
 }
@@ -122,12 +123,13 @@ export function TouchBarSlider({ label, value, minValue, maxValue, onChange }: S
     return <></>;
 }
 
-export function TouchBarButton({ label, click, enabled }: ButtonProps) {
+export function TouchBarButton({ label, icon, click, enabled }: ButtonProps) {
     const api = useContext(TouchBarContext);
 
     if (api) {
         const item = new api.TouchBar.TouchBarButton({
-            label, click, enabled
+            label, click, enabled,
+            icon: icon ? buildIcon(api.nativeImage, icon) : undefined
         });
         api.addItem(item);
     }