diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 402f499..2da183d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -239,8 +239,9 @@ permissions, and form values into the shared controls.
 - **Segmented switch:** use `<nav class="theme-switch">` with links and `active` on the current one, as on the releases
   and tags pages.
 - **Empty state:** use `theme-empty` for a bordered "nothing here" box holding an icon, an `h2` or `h3`, and an optional
-  paragraph. `templates/user/profile_empty.tmpl` renders one from `Icon`, `Title`, and `Description`. Short inline
-  messages inside a list or menu stay plain text.
+  paragraph. `templates/user/profile_empty.tmpl` renders one from `Icon`, `Title`, and `Description`. Add
+  `theme-empty-compact` for the smaller, borderless block GitHub shows inside a list. Short inline messages inside a
+  list or menu stay plain text.
 - **Label:** use Forgejo's native `ui basic label` for outline labels such as visibility or package type; do not build a
   page-specific pill.
 - **Select:** wrap a native `<select class="theme-select">` in `<span class="theme-select-wrap">`. The options stay in
diff --git a/components/common/empty/empty.css b/components/common/empty/empty.css
index f817952..61ac4e3 100644
--- a/components/common/empty/empty.css
+++ b/components/common/empty/empty.css
@@ -38,3 +38,23 @@
     padding: 32px 16px;
   }
 }
+
+/* Inside a list GitHub's empty state is a compact block without its own border. */
+.theme-empty-compact {
+  gap: 0;
+  min-height: 0;
+  padding: 32px !important;
+  border: 0;
+}
+
+.theme-empty-compact > .svg {
+  width: 24px;
+  height: 24px;
+  margin-bottom: 8px;
+}
+
+.theme-empty-compact h2,
+.theme-empty-compact h3 {
+  margin: 0 !important;
+  line-height: 32.5px;
+}
diff --git a/public/assets/js/issue-list.js b/public/assets/js/issue-list.js
index 637909a..4f21ee3 100644
--- a/public/assets/js/issue-list.js
+++ b/public/assets/js/issue-list.js
@@ -46,14 +46,9 @@
   const issues = page.querySelector("#issue-list");
   if (issues) new MutationObserver(decorateRows).observe(issues, { childList: true, subtree: true });
   const empty = page.querySelector("#issue-list > .tw-text-center");
-  if (isPullList && empty && !input.value.trim()) {
-    const state = new URL(location.href).searchParams.get("state") || "open";
-    empty.querySelector("h3").textContent =
-      state === "open"
-        ? "There aren’t any open pull requests."
-        : state === "closed"
-          ? "There aren’t any closed pull requests."
-          : "There aren’t any pull requests.";
+  if (empty) {
+    empty.classList.add("theme-empty", "theme-empty-compact");
+    if (isPullList) empty.querySelector("h3").textContent = "No pull requests matched your search";
     const icon = page.querySelector('[data-test-name="open-issue-count"] svg')?.cloneNode(true);
     if (icon) {
       icon.setAttribute("width", "24");
@@ -62,7 +57,7 @@
     }
   }
   const filters = page.querySelector("#issue-filters");
-  if (filters && !isPullList) {
+  if (filters) {
     for (const anchor of filters.querySelectorAll(".switch > a")) {
       const text = [...anchor.childNodes].find(node => node.nodeType === Node.TEXT_NODE && node.textContent.trim());
       const match = text?.textContent.trim().match(/^([\d.,\s]+)\s+(.+)$/);
diff --git a/styles/components/issues/index.ts b/styles/components/issues/index.ts
index f6989f2..63360f1 100644
--- a/styles/components/issues/index.ts
+++ b/styles/components/issues/index.ts
@@ -25,7 +25,6 @@ import issueList from "./issue_list";
 import issueOverview from "./issue_overview";
 import issueSidebar from "./issue_sidebar";
 import issueTimeline from "./issue_timeline";
-import pullList from "./pull_list";
 import pullReview from "./pull_review";
 
 export default cssCombine(
@@ -33,7 +32,6 @@ export default cssCombine(
   issueComment,
   issueList,
   issueOverview,
-  pullList,
   issueConversation,
   pullReview,
   issueSidebar,
diff --git a/styles/components/issues/issue_overview.ts b/styles/components/issues/issue_overview.ts
index 73a0916..ecddd23 100644
--- a/styles/components/issues/issue_overview.ts
+++ b/styles/components/issues/issue_overview.ts
@@ -1,7 +1,8 @@
 import { css, themeVars } from "@lutinglt/gitea-github-theme/core";
 
+// The issue list and the pull request list share one layout.
 export default css`
-  .github-issues {
+  :is(.github-issues, .github-pull-list) {
     & .list-header-issues {
       margin: 0 0 16px;
       min-height: 32px;
@@ -131,14 +132,6 @@ export default css`
       & .issue-title:hover {
         color: ${themeVars.github.fgColor.accent};
       }
-      & > .tw-text-center {
-        padding: 64px 24px;
-      }
-      & > .tw-text-center h3 {
-        font-size: 24px;
-        line-height: 32px;
-        font-weight: 600;
-      }
     }
     @media (max-width: 1011.98px) {
       & .issue-list-toolbar {
diff --git a/styles/components/issues/pull_list.ts b/styles/components/issues/pull_list.ts
deleted file mode 100644
index 7df687f..0000000
--- a/styles/components/issues/pull_list.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-import { css, otherThemeVars, themeVars } from "@lutinglt/gitea-github-theme/core";
-
-export default css`
-  .github-pull-list {
-    &.page-content.repository.issue-list > .ui.container {
-      width: calc(100% - 64px) !important;
-      max-width: 1216px !important;
-      margin: 24px auto !important;
-    }
-    & .list-header-issues {
-      display: flex;
-      flex-wrap: nowrap;
-      align-items: center;
-      gap: 0;
-      margin-top: 0;
-      margin-bottom: 16px;
-      min-height: 32px;
-    }
-    & .pull-list-presets > summary.ui.button {
-      height: 32px;
-      min-height: 32px;
-      margin: 0;
-      padding: 5px 12px;
-      font-size: 14px;
-      line-height: 20px;
-      border-radius: ${otherThemeVars.border.radius} 0 0 ${otherThemeVars.border.radius};
-      display: flex;
-      align-items: center;
-      gap: 8px;
-    }
-    & .issue-list-search {
-      & {
-        flex: 1;
-        margin: 0;
-        min-width: 0;
-      }
-      & .ui.action.input:not(.search) {
-        height: 32px;
-        border: 1px solid ${themeVars.color.light.border};
-        border-left: 0;
-        border-radius: 0 ${otherThemeVars.border.radius} ${otherThemeVars.border.radius} 0;
-        overflow: hidden;
-        background: ${themeVars.color.body};
-      }
-      & .ui.action.input:not(.search):focus-within {
-        outline: 2px solid ${themeVars.github.fgColor.accent};
-        outline-offset: -1px;
-      }
-      & input {
-        border: 0 !important;
-        box-shadow: none !important;
-        outline: none !important;
-        background: transparent !important;
-        font-size: 14px;
-        padding: 5px 12px;
-      }
-      & button {
-        width: 32px;
-        min-height: 30px;
-        height: 30px;
-        padding: 0;
-        border: 0;
-        background: transparent;
-      }
-      & > .show-modal {
-        display: none;
-      }
-    }
-    & .list-header-issues > nav.ui.menu {
-      margin: 0 16px;
-      min-height: 32px;
-      height: 32px;
-    }
-    & .list-header-issues > nav.ui.menu > .item {
-      font-size: 14px;
-      padding: 5px 12px;
-      min-height: 32px;
-    }
-    & .issue-list-new {
-      height: 32px;
-      min-height: 32px;
-      font-size: 14px;
-      line-height: 20px;
-      padding: 5px 12px;
-      margin-left: 16px;
-    }
-    & .issue-list-toolbar {
-      & {
-        height: 54px;
-        margin-top: 0;
-        padding: 8px 16px;
-      }
-      & .switch {
-        display: flex;
-        gap: 8px;
-        border: 0;
-        background: transparent;
-        box-shadow: none;
-      }
-      & .switch > .item {
-        display: flex;
-        gap: 8px;
-        align-items: center;
-        height: 32px;
-        padding: 4px;
-        border: 0;
-        outline: none;
-        background: transparent;
-        box-shadow: none;
-        color: ${themeVars.color.text.light.num1};
-      }
-      & .switch > .item.active {
-        font-weight: 600;
-        color: ${themeVars.color.text.self};
-      }
-      & .switch > .item::before,
-      & .switch > .item::after {
-        display: none;
-      }
-      & .switch > [data-test-name="all-issue-count"] {
-        display: none;
-      }
-      &-right > .ui.menu > .item {
-        font-size: 14px;
-        min-height: 32px;
-        height: 32px;
-        padding: 4px 8px;
-      }
-      &-right .list-header-author {
-        order: -1;
-      }
-    }
-    & #issue-list {
-      & > .flex-item {
-        padding: 8px 16px 10px;
-        min-height: 64px;
-        gap: 8px;
-      }
-      & .issue-title {
-        font-size: 16px;
-        line-height: 24px;
-        font-weight: 600;
-      }
-      & .issue-meta {
-        font-size: 12px;
-        line-height: 18px;
-      }
-      & .issue-checkbox {
-        margin: 0 8px 0 0 !important;
-      }
-      & > .tw-text-center {
-        padding: 80px 24px;
-        min-height: 296px;
-      }
-      & > .tw-text-center h3 {
-        font-size: 24px;
-        line-height: 32px;
-        font-weight: 600;
-      }
-    }
-    & .issue-mobile-filter-toggle {
-      display: none;
-    }
-    @media (max-width: 1011.98px) {
-      & .issue-list-toolbar {
-        flex-wrap: wrap;
-        height: auto;
-        gap: 8px;
-      }
-    }
-    @media (max-width: 767.98px) {
-      &.page-content.repository.issue-list > .ui.container {
-        width: calc(100% - 32px) !important;
-        margin: 16px !important;
-      }
-      & .list-header-issues {
-        display: grid;
-        grid-template-columns: 86px minmax(0, 1fr) auto;
-        gap: 8px 0;
-      }
-      & .pull-list-presets {
-        grid-column: 1;
-        grid-row: 2;
-      }
-      & .issue-list-search {
-        grid-column: 2 / -1;
-        grid-row: 2;
-        width: auto !important;
-      }
-      & .list-header-issues > nav.ui.menu {
-        grid-column: 1 / 3;
-        grid-row: 1;
-        margin: 0;
-        width: max-content;
-      }
-      & .issue-list-new {
-        grid-column: 3;
-        grid-row: 1;
-      }
-      & .issue-list-search {
-        flex-basis: calc(100% - 90px);
-      }
-      & .list-header-issues > nav.ui.menu {
-        margin: 0;
-      }
-      & .issue-list-new {
-        margin-left: auto;
-      }
-      & .issue-list-toolbar {
-        flex-wrap: nowrap;
-        position: relative;
-        justify-content: space-between;
-        padding: 8px;
-      }
-      & .issue-mobile-filter-toggle {
-        display: inline-flex;
-      }
-      & #issue-filters > .issue-list-toolbar-right {
-        display: none;
-      }
-      & #issue-filters.issue-mobile-filters-open > .issue-list-toolbar-right {
-        display: block;
-        position: absolute;
-        top: 100%;
-        right: 0;
-        z-index: 30;
-        width: 280px;
-        padding: 8px;
-        background: ${themeVars.color.menu};
-        border-radius: 12px;
-        box-shadow: ${themeVars.github.shadow.floating.small};
-      }
-      & #issue-filters.issue-mobile-filters-open > .issue-list-toolbar-right .ui.menu {
-        display: flex;
-        flex-direction: column;
-        align-items: stretch;
-      }
-      & #issue-list > .flex-item {
-        padding: 12px;
-      }
-      &.page-content.repository #issue-list .flex-item-header {
-        flex-direction: row;
-        flex-wrap: nowrap;
-      }
-      & #issue-list .flex-item-title {
-        flex: 1;
-        min-width: 0;
-      }
-
-      & #issue-list .flex-item-trailing {
-        flex: 0 0 auto;
-        margin: 0 0 0 8px;
-      }
-    }
-  }
-`;
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 75b8157..10fb2a9 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository issue-list{{if .PageIsIssueList}} github-issues theme-sidebar-layout{{else}} github-pull-list{{end}}"{{if .PageIsIssueList}} data-theme-sidebar="issue_sidebar_collapsed"{{end}}>
-	{{if .PageIsIssueList}}{{template "repo/issue/sidebar" .}}{{end}}
+<div role="main" aria-label="{{.Title}}" class="page-content repository issue-list theme-sidebar-layout{{if .PageIsIssueList}} github-issues{{else}} github-pull-list{{end}}" data-theme-sidebar="{{if .PageIsIssueList}}issue_sidebar_collapsed{{else}}pull_sidebar_collapsed{{end}}">
+	{{template "repo/issue/sidebar" .}}
 	<div class="ui container issue-list-main theme-sidebar-main">
 	{{template "base/alert" .}}
 
@@ -15,23 +15,7 @@
 	{{end}}
 
 		<div class="list-header list-header-issues">
-			{{if not .PageIsIssueList}}
-                <details class="theme-menu pull-list-presets">
-                    <summary class="ui button">Filters {{svg "octicon-triangle-down" 12}}</summary>
-                    <div class="theme-menu-popover">
-                        <a href="{{.RepoLink}}/pulls?type=all&amp;state=open">Open pull requests</a>
-                        <a href="{{.RepoLink}}/pulls?type=all&amp;state=closed">Closed pull requests</a>
-                        <a href="{{.RepoLink}}/pulls?type=all&amp;state=all">All pull requests</a>
-                        {{if .IsSigned}}
-                            <hr><a href="{{.RepoLink}}/pulls?type=created_by&amp;state=open">Created by me</a>
-                            <a href="{{.RepoLink}}/pulls?type=assigned&amp;state=open">Assigned to me</a>
-                            <a href="{{.RepoLink}}/pulls?type=mentioned&amp;state=open">Mentioning me</a>
-                            <a href="{{.RepoLink}}/pulls?type=review_requested&amp;state=open">Review requested</a>
-                        {{end}}
-                    </div>
-                </details>
-            {{else}}<div class="issue-list-title"><button type="button" class="theme-icon-button" data-theme-sidebar-toggle data-theme-sidebar-expand aria-expanded="false" aria-label="Expand sidebar">{{svg "octicon-sidebar-expand" 16}}</button><h1>{{if eq .ViewType "assigned"}}Assigned to me{{else if eq .ViewType "created_by"}}Created by me{{else if eq .ViewType "mentioned"}}Mentioned{{else}}All issues{{end}}</h1></div>{{end}}
-			{{if not .PageIsIssueList}}{{template "repo/issue/search" .}}<nav class="ui compact menu pull-list-pages" aria-label="Issue pages"><a class="item" href="{{.RepoLink}}/labels">{{svg "octicon-tag" 16}}{{ctx.Locale.Tr "repo.labels"}}</a><a class="item" href="{{.RepoLink}}/milestones">{{svg "octicon-milestone" 16}}{{ctx.Locale.Tr "repo.milestones"}}</a></nav>{{end}}
+			<div class="issue-list-title"><button type="button" class="theme-icon-button" data-theme-sidebar-toggle data-theme-sidebar-expand aria-expanded="false" aria-label="Expand sidebar">{{svg "octicon-sidebar-expand" 16}}</button><h1>{{if eq .ViewType "assigned"}}Assigned to me{{else if eq .ViewType "created_by"}}Created by me{{else if eq .ViewType "mentioned"}}Mentioned{{else if eq .ViewType "review_requested"}}Review requested{{else if .PageIsIssueList}}All issues{{else}}All pull requests{{end}}</h1></div>
 			{{if not .Repository.IsArchived}}
 				{{if .PageIsIssueList}}
 					<a class="primary button issue-list-new" href="{{.RepoLink}}/issues/new{{if .NewIssueChooseTemplate}}/choose{{end}}">{{ctx.Locale.Tr "repo.issues.new"}}</a>
@@ -45,7 +29,7 @@
 			{{end}}
 		</div>
 
-        {{if .PageIsIssueList}}{{template "repo/issue/search" .}}{{end}}
+		{{template "repo/issue/search" .}}
 
 		{{template "repo/issue/filters" .}}
 
@@ -70,5 +54,4 @@
 	</div>
 </div>
 <script src="{{AssetUrlPrefix}}/js/issue-list.js" defer></script>
-{{if not .PageIsIssueList}}<script src="{{AssetUrlPrefix}}/js/details-menu.js" defer></script>{{end}}
 {{template "base/footer" .}}
diff --git a/templates/repo/issue/sidebar.tmpl b/templates/repo/issue/sidebar.tmpl
index d481a02..85899f1 100644
--- a/templates/repo/issue/sidebar.tmpl
+++ b/templates/repo/issue/sidebar.tmpl
@@ -1,18 +1,21 @@
-<aside class="theme-sidebar" aria-label="Issues sidebar navigation">
+{{/* The issue list and the pull request list share this sidebar; only the first entry and "Review requested" differ. */}}
+{{$list := "issues"}}{{if .PageIsPullList}}{{$list = "pulls"}}{{end}}
+<aside class="theme-sidebar" aria-label="{{if .PageIsPullList}}Pull requests{{else}}Issues{{end}} sidebar navigation">
     <div class="theme-sidebar-content">
-    <nav aria-label="Issue filters">
-        <a class="{{if or (eq .ViewType "all") (not .ViewType)}}active{{end}}" href="{{.RepoLink}}/issues?type=all&amp;state=open">{{svg "octicon-issue-opened" 16}}Issues</a>
+    <nav aria-label="{{if .PageIsPullList}}Pull request{{else}}Issue{{end}} filters">
+        <a class="{{if or (eq .ViewType "all") (not .ViewType)}}active{{end}}" href="{{.RepoLink}}/{{$list}}?type=all&amp;state=open">{{if .PageIsPullList}}{{svg "octicon-git-pull-request" 16}}Pull requests{{else}}{{svg "octicon-issue-opened" 16}}Issues{{end}}</a>
         {{if .IsSigned}}
-            <a class="{{if eq .ViewType "assigned"}}active{{end}}" href="{{.RepoLink}}/issues?type=assigned&amp;state=open">{{svg "octicon-people" 16}}Assigned to me</a>
-            <a class="{{if eq .ViewType "created_by"}}active{{end}}" href="{{.RepoLink}}/issues?type=created_by&amp;state=open">{{svg "octicon-person" 16}}Created by me</a>
-            <a class="{{if eq .ViewType "mentioned"}}active{{end}}" href="{{.RepoLink}}/issues?type=mentioned&amp;state=open">{{svg "octicon-mention" 16}}Mentioned</a>
+            <a class="{{if eq .ViewType "assigned"}}active{{end}}" href="{{.RepoLink}}/{{$list}}?type=assigned&amp;state=open">{{svg "octicon-people" 16}}Assigned to me</a>
+            <a class="{{if eq .ViewType "created_by"}}active{{end}}" href="{{.RepoLink}}/{{$list}}?type=created_by&amp;state=open">{{svg "octicon-person" 16}}Created by me</a>
+            <a class="{{if eq .ViewType "mentioned"}}active{{end}}" href="{{.RepoLink}}/{{$list}}?type=mentioned&amp;state=open">{{svg "octicon-mention" 16}}Mentioned</a>
+            {{if .PageIsPullList}}<a class="{{if eq .ViewType "review_requested"}}active{{end}}" href="{{.RepoLink}}/pulls?type=review_requested&amp;state=open">{{svg "octicon-code-review" 16}}Review requested</a>{{end}}
         {{end}}
-        <a href="{{.RepoLink}}/issues?sort=recentupdate&amp;state=all">{{svg "octicon-history" 16}}Recent activity</a>
+        <a href="{{.RepoLink}}/{{$list}}?sort=recentupdate&amp;state=all">{{svg "octicon-history" 16}}Recent activity</a>
     </nav>
     <hr>
     <nav aria-label="Pages">
         <a href="{{.RepoLink}}/milestones">{{svg "octicon-milestone" 16}}{{ctx.Locale.Tr "repo.milestones"}}</a>
-        <a href="{{.RepoLink}}/issues?state=all">{{svg "octicon-eye" 16}}All states</a>
+        <a href="{{.RepoLink}}/{{$list}}?state=all">{{svg "octicon-eye" 16}}All states</a>
         <a href="https://forgejo.org/docs/latest/user/issue-search/" target="_blank" rel="noopener noreferrer">{{svg "octicon-question" 16}}Search syntax</a>
         <a href="{{.RepoLink}}/labels">{{svg "octicon-tag" 16}}{{ctx.Locale.Tr "repo.labels"}}</a>
     </nav>