diff --git a/packages/app/src/components/sidebar-workspace-list.tsx b/packages/app/src/components/sidebar-workspace-list.tsx
index f4f88a87c..8467117c4 100644
--- a/packages/app/src/components/sidebar-workspace-list.tsx
+++ b/packages/app/src/components/sidebar-workspace-list.tsx
@@ -335,7 +335,7 @@ export function PrBadge({ hint }: { hint: PrHint }) {
         <ThemedGitPullRequest size={12} uniProps={iconUniProps} />
       )}
       <Text style={textStyle} numberOfLines={1}>
-        #{hint.number}
+        {hint.number}
       </Text>
     </Pressable>
   );
diff --git a/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx b/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
index 10d844094..1d4246bf6 100644
--- a/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
+++ b/packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx
@@ -315,7 +315,7 @@ function PrBadge({ hint }: { hint: PrHint }) {
         <ThemedGitPullRequest size={12} uniProps={iconUniProps} />
       )}
       <Text style={textStyle} numberOfLines={1}>
-        #{hint.number}
+        {hint.number}
       </Text>
     </Pressable>
   );
diff --git a/packages/app/src/git/pull-request-panel/tab-label.test.ts b/packages/app/src/git/pull-request-panel/tab-label.test.ts
index 279c5d6f8..b461e7ddf 100644
--- a/packages/app/src/git/pull-request-panel/tab-label.test.ts
+++ b/packages/app/src/git/pull-request-panel/tab-label.test.ts
@@ -2,11 +2,11 @@ import { describe, expect, it } from "vitest";
 import { formatPrTabLabel } from "./tab-label";
 
 describe("formatPrTabLabel", () => {
-  it("returns #<number> when a pull request number is present", () => {
-    expect(formatPrTabLabel(42)).toBe("#42");
+  it("returns the number when a pull request number is present", () => {
+    expect(formatPrTabLabel(42)).toBe("42");
   });
 
-  it("returns #— fallback when the pull request number is null", () => {
-    expect(formatPrTabLabel(null)).toBe("#—");
+  it("returns the — fallback when the pull request number is null", () => {
+    expect(formatPrTabLabel(null)).toBe("—");
   });
 });
diff --git a/packages/app/src/git/pull-request-panel/tab-label.ts b/packages/app/src/git/pull-request-panel/tab-label.ts
index 8381b6bc0..0234cad6c 100644
--- a/packages/app/src/git/pull-request-panel/tab-label.ts
+++ b/packages/app/src/git/pull-request-panel/tab-label.ts
@@ -1,3 +1,3 @@
 export function formatPrTabLabel(prNumber: number | null): string {
-  return prNumber === null ? "#—" : `#${prNumber}`;
+  return prNumber === null ? "—" : `${prNumber}`;
 }
diff --git a/packages/app/src/screens/workspace/workspace-open-in-editor-button.tsx b/packages/app/src/screens/workspace/workspace-open-in-editor-button.tsx
index 929871a3d..b52d95583 100644
--- a/packages/app/src/screens/workspace/workspace-open-in-editor-button.tsx
+++ b/packages/app/src/screens/workspace/workspace-open-in-editor-button.tsx
@@ -313,6 +313,7 @@ const styles = StyleSheet.create((theme) => ({
     alignItems: "center",
     justifyContent: "center",
     gap: theme.spacing[2],
+    minHeight: theme.fontSize.sm * 1.5,
   },
   splitButtonSpinnerOnly: {
     transform: [{ scale: 0.8 }],
diff --git a/packages/app/src/screens/workspace/workspace-screen.tsx b/packages/app/src/screens/workspace/workspace-screen.tsx
index 50896cf98..c724b561c 100644
--- a/packages/app/src/screens/workspace/workspace-screen.tsx
+++ b/packages/app/src/screens/workspace/workspace-screen.tsx
@@ -3390,7 +3390,7 @@ function WorkspaceScreenContent({
             onScriptTerminalStarted={handleScriptTerminalStarted}
             onViewTerminal={handleViewScriptTerminal}
             onOpenUrlInBrowserTab={handleOpenUrlInBrowserTab}
-            hideLabels={showCompactButtonLabels}
+            hideLabels
           />
         ) : null}
         {!isMobile && workspaceDirectory ? (
@@ -3398,7 +3398,7 @@ function WorkspaceScreenContent({
             serverId={normalizedServerId}
             cwd={workspaceDirectory}
             activeFile={activeFileLocation}
-            hideLabels={showCompactButtonLabels}
+            hideLabels
           />
         ) : null}
         {!isMobile && isGitCheckout ? (
diff --git a/packages/app/src/screens/workspace/workspace-scripts-button.tsx b/packages/app/src/screens/workspace/workspace-scripts-button.tsx
index 62545de6a..4d3b25ec6 100644
--- a/packages/app/src/screens/workspace/workspace-scripts-button.tsx
+++ b/packages/app/src/screens/workspace/workspace-scripts-button.tsx
@@ -542,6 +542,7 @@ const styles = StyleSheet.create((theme) => ({
     alignItems: "center",
     justifyContent: "center",
     gap: theme.spacing[1.5],
+    minHeight: theme.fontSize.sm * 1.5,
   },
   scriptList: {
     paddingVertical: theme.spacing[1],