diff --git a/src/public/stylesheets/theme-next/base.css b/src/public/stylesheets/theme-next/base.css
index a43169f4e..7822e606b 100644
--- a/src/public/stylesheets/theme-next/base.css
+++ b/src/public/stylesheets/theme-next/base.css
@@ -3,7 +3,6 @@
 @import url(./dialogs.css);
 @import url(./pages.css);
 @import url(./ribbon.css);
-@import url(./notes/empty.css);
 @import url(./notes/text.css);
 
 @font-face {
diff --git a/src/public/stylesheets/theme-next/dialogs.css b/src/public/stylesheets/theme-next/dialogs.css
index 23c3cf10a..e73c555fc 100644
--- a/src/public/stylesheets/theme-next/dialogs.css
+++ b/src/public/stylesheets/theme-next/dialogs.css
@@ -385,3 +385,14 @@ div.tn-tool-dialog {
 .delete-notes-list .note-path {
     padding-left: 8px;
 }
+
+/*
+ * ATTRIBUTE DETAIL DIALOG
+ */
+
+/* Labels */
+.attr-edit-table th {
+    padding-right: 12px;
+    font-weight: normal;
+    white-space: nowrap;
+}
\ No newline at end of file
diff --git a/src/public/stylesheets/theme-next/notes/empty.css b/src/public/stylesheets/theme-next/notes/empty.css
deleted file mode 100644
index dbfd92a4d..000000000
--- a/src/public/stylesheets/theme-next/notes/empty.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* The container */
-div.note-detail-empty {
-    max-width: 70%;
-    margin: 50px auto;
-}
-
-/* The search results list */
-.note-detail-empty span.aa-dropdown-menu {
-    margin-top: 1em;
-    border: unset;
-}
diff --git a/src/public/stylesheets/theme-next/notes/text.css b/src/public/stylesheets/theme-next/notes/text.css
index 55aaba032..cf8aa4760 100644
--- a/src/public/stylesheets/theme-next/notes/text.css
+++ b/src/public/stylesheets/theme-next/notes/text.css
@@ -132,105 +132,4 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
 .ck-content .table > figcaption {
     background: var(--accented-background-color);
     color: var(--main-text-color);
-}
-
-/*
- * Search in text panel
- */
-
-.find-replace-widget {
-    container-type: inline-size;
-    border-top: 3px solid var(--root-background) !important;
-}
-
-.find-replace-widget > div {
-    padding: 8px;
-}
-
-.find-replace-widget > div + div {
-    padding-top: 0;
-}
-
-div.find-replace-widget div.find-widget-found-wrapper > span {
-    min-width: 50px;
-    font-style: normal;
-    font-weight: normal;
-}
-
-/* The up / down buttons of the "Find in text" input */
-.find-replace-widget .input-group button {
-    font-size: 1.3em;
-}
-
-.find-replace-widget .form-check {
-    padding-left: 0;
-    white-space: nowrap;
-}
-
-.find-replace-widget .form-check .form-check-input {
-    margin-left: 0;
-}
-
-/* Narrow version */
-@container (max-width: 600px) {
-    .find-replace-widget > *,
-    .find-replace-widget input,
-    .find-replace-widget button.btn.btn-sm {
-        font-size: .9em;
-    }
-
-    .find-widget-box {
-        position: relative;
-        justify-content: center;
-        flex-wrap: wrap;
-        gap: 8px;
-    }
-
-    .find-widget-box,
-    .replace-widget-box {
-        padding-right: 3em !important;
-    }
-
-    .find-widget-close-button {
-        position: absolute;
-        top: .85em;
-        right: .5em;
-    }
-
-    .find-widget-box > * {
-        margin: unset !important;
-    }
-
-    div.find-widget-search-term-input-group {
-        margin-bottom: 8px;
-        max-width: unset;
-        width: 100%;
-    }
-
-    .find-widget-found-wrapper,
-    .find-widget-found-wrapper > span {
-        min-width: 0 !important;
-    }
-
-    .find-widget-spacer {
-        display: none;
-    }
-
-    .form-check {
-        min-height: unset;
-        margin-bottom: unset;
-    }
-
-    .replace-widget-box {
-        gap: 8px;
-    }
-
-    .replace-widget-box > * {
-        margin-right: unset !important;
-    }
-
-    div.replace-widget-box button.btn.btn-sm {
-        min-width: unset;
-        white-space: nowrap;
-    }
-}
+}
\ No newline at end of file
diff --git a/src/public/stylesheets/theme-next/pages.css b/src/public/stylesheets/theme-next/pages.css
index eb67263c0..c27c338b3 100644
--- a/src/public/stylesheets/theme-next/pages.css
+++ b/src/public/stylesheets/theme-next/pages.css
@@ -101,6 +101,22 @@
     color: var(--tab-close-button-hover-background);
 }
 
+/*
+ * EMPTY NOTE PAGE
+ */
+
+/* The container */
+div.note-detail-empty {
+    max-width: 70%;
+    margin: 50px auto;
+}
+
+/* The search results list */
+.note-detail-empty span.aa-dropdown-menu {
+    margin-top: 1em;
+    border: unset;
+}
+
 /*
  * OPTIONS PAGES
  */
diff --git a/src/public/stylesheets/theme-next/ribbon.css b/src/public/stylesheets/theme-next/ribbon.css
index 56e3e5d66..c7765865d 100644
--- a/src/public/stylesheets/theme-next/ribbon.css
+++ b/src/public/stylesheets/theme-next/ribbon.css
@@ -153,15 +153,4 @@ div.editability-dropdown a.dropdown-item {
 /* Narrow width layout */
 .note-info-widget {
     container: info-section / inline-size;
-}
-
-/*
- * Attribute detail dialog
- */
-
-/* Labels */
-.attr-edit-table th {
-    padding-right: 12px;
-    font-weight: normal;
-    white-space: nowrap;
-}
+}
\ No newline at end of file
diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index 05d0cb119..d6e72687e 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1304,6 +1304,107 @@ div.promoted-attribute-cell .multiplicity:has(span) {
     font-size: 0; /* Prevent whitespaces creating a gap between buttons */
 }
 
+/*
+ * Find and replace bar
+ */
+
+ .find-replace-widget {
+    container-type: inline-size;
+    border-top: 3px solid var(--root-background) !important;
+}
+
+.find-replace-widget > div {
+    padding: 8px;
+}
+
+.find-replace-widget > div + div {
+    padding-top: 0;
+}
+
+div.find-replace-widget div.find-widget-found-wrapper > span {
+    min-width: 50px;
+    font-style: normal;
+    font-weight: normal;
+}
+
+/* The up / down buttons of the "Find in text" input */
+.find-replace-widget .input-group button {
+    font-size: 1.3em;
+}
+
+.find-replace-widget .form-check {
+    padding-left: 0;
+    white-space: nowrap;
+}
+
+.find-replace-widget .form-check .form-check-input {
+    margin-left: 0;
+}
+
+/* Narrow version */
+@container (max-width: 600px) {
+    .find-replace-widget > *,
+    .find-replace-widget input,
+    .find-replace-widget button.btn.btn-sm {
+        font-size: .9em;
+    }
+
+    .find-widget-box {
+        position: relative;
+        justify-content: center;
+        flex-wrap: wrap;
+        gap: 8px;
+    }
+
+    .find-widget-box,
+    .replace-widget-box {
+        padding-right: 3em !important;
+    }
+
+    .find-widget-close-button {
+        position: absolute;
+        top: .85em;
+        right: .5em;
+    }
+
+    .find-widget-box > * {
+        margin: unset !important;
+    }
+
+    div.find-widget-search-term-input-group {
+        margin-bottom: 8px;
+        max-width: unset;
+        width: 100%;
+    }
+
+    .find-widget-found-wrapper,
+    .find-widget-found-wrapper > span {
+        min-width: 0 !important;
+    }
+
+    .find-widget-spacer {
+        display: none;
+    }
+
+    .form-check {
+        min-height: unset;
+        margin-bottom: unset;
+    }
+
+    .replace-widget-box {
+        gap: 8px;
+    }
+
+    .replace-widget-box > * {
+        margin-right: unset !important;
+    }
+
+    div.replace-widget-box button.btn.btn-sm {
+        min-width: unset;
+        white-space: nowrap;
+    }
+}
+
 /*
  * RIGHT PANE: TABLE OF CONTENTS AND HIGHLIGHT LIST
  */