diff --git a/weave-js/src/assets/icons/icon-visible.svg b/weave-js/src/assets/icons/icon-visible.svg
new file mode 100644
index 00000000000..823c36bb17f
--- /dev/null
+++ b/weave-js/src/assets/icons/icon-visible.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12ZM15.5 12C15.5 13.933 13.933 15.5 12 15.5C10.067 15.5 8.5 13.933 8.5 12C8.5 10.067 10.067 8.5 12 8.5C13.933 8.5 15.5 10.067 15.5 12Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 3.75C8.28497 3.75 5.5985 5.21584 3.84467 6.96967C2.97227 7.84207 2.33072 8.78514 1.90468 9.65426C1.48605 10.5083 1.25 11.3438 1.25 12C1.25 12.6562 1.48605 13.4917 1.90468 14.3457C2.33072 15.2149 2.97227 16.1579 3.84467 17.0303C5.5985 18.7842 8.28497 20.25 12 20.25C15.715 20.25 18.4015 18.7842 20.1553 17.0303C21.0277 16.1579 21.6693 15.2149 22.0953 14.3457C22.5139 13.4917 22.75 12.6562 22.75 12C22.75 11.3438 22.5139 10.5083 22.0953 9.65426C21.6693 8.78514 21.0277 7.84207 20.1553 6.96967C18.4015 5.21584 15.715 3.75 12 3.75ZM2.75 12C2.75 11.6562 2.88895 11.0542 3.25156 10.3145C3.60678 9.58986 4.15273 8.78293 4.90533 8.03033C6.4015 6.53416 8.71503 5.25 12 5.25C15.285 5.25 17.5985 6.53416 19.0947 8.03033C19.8473 8.78293 20.3932 9.58986 20.7484 10.3145C21.1111 11.0542 21.25 11.6562 21.25 12C21.25 12.3438 21.1111 12.9458 20.7484 13.6855C20.3932 14.4101 19.8473 15.2171 19.0947 15.9697C17.5985 17.4658 15.285 18.75 12 18.75C8.71503 18.75 6.4015 17.4658 4.90533 15.9697C4.15273 15.2171 3.60678 14.4101 3.25156 13.6855C2.88895 12.9458 2.75 12.3438 2.75 12Z" fill="currentColor"/>
+</svg>
diff --git a/weave-js/src/components/Icon/Icon.tsx b/weave-js/src/components/Icon/Icon.tsx
index 9c020b1bab9..32b9ca65921 100644
--- a/weave-js/src/components/Icon/Icon.tsx
+++ b/weave-js/src/components/Icon/Icon.tsx
@@ -256,6 +256,7 @@ import {ReactComponent as ImportVersionsLayers} from '../../assets/icons/icon-ve
 import {ReactComponent as ImportVertexGCP} from '../../assets/icons/icon-vertex-gcp.svg';
 import {ReactComponent as ImportVideoPlay} from '../../assets/icons/icon-video-play.svg';
 import {ReactComponent as ImportViewGlasses} from '../../assets/icons/icon-view-glasses.svg';
+import {ReactComponent as ImportVisible} from '../../assets/icons/icon-visible.svg';
 import {ReactComponent as ImportWandb} from '../../assets/icons/icon-wandb.svg';
 import {ReactComponent as ImportWarning} from '../../assets/icons/icon-warning.svg';
 import {ReactComponent as ImportWarningAlt} from '../../assets/icons/icon-warning-alt.svg';
@@ -1048,6 +1049,9 @@ export const IconVideoPlay = (props: SVGIconProps) => (
 export const IconViewGlasses = (props: SVGIconProps) => (
   <ImportViewGlasses {...updateIconProps(props)} />
 );
+export const IconVisible = (props: SVGIconProps) => (
+  <ImportVisible {...updateIconProps(props)} />
+);
 export const IconWandb = (props: SVGIconProps) => (
   <ImportWandb {...updateIconProps(props)} />
 );
@@ -1336,6 +1340,7 @@ const ICON_NAME_TO_ICON: Record<IconName, ElementType> = {
   'vertex-gcp': IconVertexGCP,
   'video-play': IconVideoPlay,
   'view-glasses': IconViewGlasses,
+  visible: IconVisible,
   wandb: IconWandb,
   warning: IconWarning,
   'warning-alt': IconWarningAlt,
diff --git a/weave-js/src/components/Icon/index.ts b/weave-js/src/components/Icon/index.ts
index 85ea5332649..08bf7854ad2 100644
--- a/weave-js/src/components/Icon/index.ts
+++ b/weave-js/src/components/Icon/index.ts
@@ -256,6 +256,7 @@ export {
   IconVertexGCP,
   IconVideoPlay,
   IconViewGlasses,
+  IconVisible,
   IconWandb,
   IconWarning,
   IconWarningAlt,
diff --git a/weave-js/src/components/Icon/types.ts b/weave-js/src/components/Icon/types.ts
index 87a1207bc85..7ca30049257 100644
--- a/weave-js/src/components/Icon/types.ts
+++ b/weave-js/src/components/Icon/types.ts
@@ -255,6 +255,7 @@ export const IconNames = {
   VertexGCP: 'vertex-gcp',
   VideoPlay: 'video-play',
   ViewGlasses: 'view-glasses',
+  Visible: 'visible',
   Wandb: 'wandb',
   Warning: 'warning',
   WarningAlt: 'warning-alt',
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/ChoiceView.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/ChoiceView.tsx
index 9e24e7e0a4a..e511d6fbf5c 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/ChoiceView.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/ChoiceView.tsx
@@ -8,6 +8,7 @@ type ChoiceViewProps = {
   isStructuredOutput?: boolean;
   isNested?: boolean;
   choiceIndex?: number;
+  messageHeader?: React.ReactNode;
 };
 
 export const ChoiceView = ({
@@ -15,6 +16,7 @@ export const ChoiceView = ({
   isStructuredOutput,
   isNested,
   choiceIndex,
+  messageHeader,
 }: ChoiceViewProps) => {
   const {message} = choice;
   return (
@@ -24,6 +26,7 @@ export const ChoiceView = ({
       isStructuredOutput={isStructuredOutput}
       isNested={isNested}
       choiceIndex={choiceIndex}
+      messageHeader={messageHeader}
     />
   );
 };
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/ChoicesViewCarousel.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/ChoicesViewCarousel.tsx
index 18760817665..b7dc6eb427d 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/ChoicesViewCarousel.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/ChoicesViewCarousel.tsx
@@ -29,38 +29,39 @@ export const ChoicesViewCarousel = ({
   };
 
   return (
-    <>
-      <ChoiceView
-        choice={choices[selectedChoiceIndex]}
-        isStructuredOutput={isStructuredOutput}
-        choiceIndex={selectedChoiceIndex}
-      />
-      <div className="flex items-center">
-        <div className="flex-auto">
+    <ChoiceView
+      choice={choices[selectedChoiceIndex]}
+      isStructuredOutput={isStructuredOutput}
+      choiceIndex={selectedChoiceIndex}
+      messageHeader={
+        <div className="mb-8 flex items-center gap-4">
+          <div className="flex items-center gap-12">
+            <Button
+              variant="ghost"
+              icon="chevron-back"
+              size="small"
+              onClick={onBack}
+            />
+            <span className="text-sm text-moon-500">
+              {selectedChoiceIndex + 1} of {choices.length}
+            </span>
+            <Button
+              variant="ghost"
+              icon="chevron-next"
+              size="small"
+              onClick={onNext}
+            />
+          </div>
           <Button
             size="small"
             variant="quiet"
-            icon="expand-uncollapse"
+            icon="visible"
             onClick={() => setIsDrawerOpen(true)}
-            tooltip="Switch to linear view"
-          />
+            tooltip="Switch to linear view">
+            Review
+          </Button>
         </div>
-        <div className="flex items-center gap-12">
-          <Button
-            variant="ghost"
-            icon="chevron-back"
-            size="small"
-            onClick={onBack}
-          />
-          {selectedChoiceIndex + 1} of {choices.length}
-          <Button
-            variant="ghost"
-            icon="chevron-next"
-            size="small"
-            onClick={onNext}
-          />
-        </div>
-      </div>
-    </>
+      }
+    />
   );
 };
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/MessagePanel.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/MessagePanel.tsx
index 1e778727522..f570b2f6295 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/MessagePanel.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ChatView/MessagePanel.tsx
@@ -18,6 +18,7 @@ type MessagePanelProps = {
   choiceIndex?: number;
   isNested?: boolean;
   pendingToolResponseId?: string;
+  messageHeader?: React.ReactNode;
 };
 
 export const MessagePanel = ({
@@ -30,6 +31,7 @@ export const MessagePanel = ({
   // If the tool call response is pending, the editor will be shown automatically
   // and on save the tool call response will be updated and sent to the LLM
   pendingToolResponseId,
+  messageHeader,
 }: MessagePanelProps) => {
   const [isShowingMore, setIsShowingMore] = useState(false);
   const [isOverflowing, setIsOverflowing] = useState(false);
@@ -116,6 +118,7 @@ export const MessagePanel = ({
                 'max-h-[400px]': !isShowingMore,
                 'max-h-full': isShowingMore,
               })}>
+              {messageHeader}
               {isPlayground && editorHeight ? (
                 <PlaygroundMessagePanelEditor
                   message={message}