diff --git a/app/services/project_identifiers/revert_project_to_classic_service.rb b/app/services/project_identifiers/revert_project_to_classic_service.rb
index 718d3321409..da3a37a89b2 100644
--- a/app/services/project_identifiers/revert_project_to_classic_service.rb
+++ b/app/services/project_identifiers/revert_project_to_classic_service.rb
@@ -51,12 +51,24 @@ module ProjectIdentifiers
     attr_reader :project
 
     def restore_classic_identifier
-      generator = ProjectIdentifiers::ClassicIdentifierSuggestionGenerator.new
-      classic = generator.restore_identifier(project) || generator.suggest_identifier(project.name)
+      classic_id = identifier_generator.restore_identifier(project) ||
+                   identifier_generator.suggest_identifier(project.name)
       # Suppress notifications: this is a background system operation, not a user edit.
       Journal::NotificationConfiguration.with(false) do
-        project.update!(identifier: classic)
+        project.update!(identifier: classic_id)
+      rescue ActiveRecord::RecordInvalid => e
+        handle_update_failure(classic_id, e)
       end
     end
+
+    def handle_update_failure(classic_id, error)
+      Rails.logger.warn "#{self.class}: Could not set identifier '#{classic_id}' for project #{project.id}; " \
+                        "falling back to a randomized suffix. (#{error.message})"
+      project.update!(identifier: "project-#{SecureRandom.alphanumeric(5).downcase}")
+    end
+
+    def identifier_generator
+      @identifier_generator ||= ProjectIdentifiers::ClassicIdentifierSuggestionGenerator.new
+    end
   end
 end
diff --git a/app/views/admin/import/jira/instances/index.html.erb b/app/views/admin/import/jira/instances/index.html.erb
index 64f14227d79..a9dc8c283ce 100644
--- a/app/views/admin/import/jira/instances/index.html.erb
+++ b/app/views/admin/import/jira/instances/index.html.erb
@@ -93,7 +93,9 @@ See COPYRIGHT and LICENSE files for more details.
             title: I18n.t(:"admin.jira.run.wizard.sections.import_scope.label_supported_data"),
             list: [
               I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.projects"),
+              I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.project_ids"),
               I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.issues"),
+              I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.issue_ids"),
               I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.issue_details"),
               I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.custom_fields"),
               I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.users"),
@@ -107,8 +109,6 @@ See COPYRIGHT and LICENSE files for more details.
           render(Admin::Import::Jira::ImportRuns::InfoListBoxComponent.new(
             title: I18n.t(:"admin.jira.run.wizard.sections.import_scope.label_coming_soon"),
             list: [
-              I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.project_ids"),
-              I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.issue_ids"),
               I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.relations"),
               I18n.t(:"admin.jira.run.wizard.sections.import_scope.elements.sprints"),
             ].map { |label| { label:, checked: false } },
diff --git a/app/views/work_packages/bulk/edit.html.erb b/app/views/work_packages/bulk/edit.html.erb
index eaf3f3c30bb..ec0ea3ee155 100644
--- a/app/views/work_packages/bulk/edit.html.erb
+++ b/app/views/work_packages/bulk/edit.html.erb
@@ -42,7 +42,7 @@ See COPYRIGHT and LICENSE files for more details.
 <ul>
   <% @work_packages.each do |wp| %>
     <li>
-      <%= link_to(h("#{wp.type} ##{wp.id}"), work_package_path(wp)) %>:
+      <%= link_to(h("#{wp.type} #{wp.formatted_id}"), work_package_path(wp)) %>:
       <%= wp.subject %>
     </li>
   <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bc67b832d7e..35c1c7fa562 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -148,7 +148,7 @@ en:
         custom_field_creation_failed: "Failed to create custom field '%{name}': %{message}"
         semantic_identifiers_must_be_enabled:
           title: "Project-based semantic identifiers must be enabled."
-          description: "Jira uses work items identifiers consisting of project key and a sequence number (PRJ-123). OpenProject also supports it, but it needs to be enabled [here](link)."
+          description: "Jira uses issue identifiers consisting of a project key and a sequence number (PRJ-123). OpenProject also supports it, but it needs to be enabled [here](link)."
       blank:
         title: "No Jira hosts configured yet"
         description: "Configure a Jira host to start importing items from Jira to this OpenProject instance."
@@ -295,7 +295,7 @@ en:
               elements:
                 relations: "Relations between issues"
                 project_ids: "Project identifiers"
-                issue_ids: "Issues identifiers"
+                issue_ids: "Issue identifiers"
                 sprints: "Sprint assignments"
                 workflows: "Project-level workflows"
                 schemes: "Schemas"
diff --git a/docs/getting-started/projects/openproject_getting_started_create_new_project_name.png b/docs/getting-started/projects/openproject_getting_started_create_new_project_name.png
index 3fa7d1dfb39..a9ae5c48b34 100644
Binary files a/docs/getting-started/projects/openproject_getting_started_create_new_project_name.png and b/docs/getting-started/projects/openproject_getting_started_create_new_project_name.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import.png
index d029c8f3606..462a4ae41e7 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_check_data.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_check_data.png
index 7141e2e4c92..3203b3c7d51 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_check_data.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_check_data.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_data_fetched.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_data_fetched.png
index 38ac0b02f7d..b8427e49742 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_data_fetched.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_data_fetched.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_data_fetched_select_project_button.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_data_fetched_select_project_button.png
index e349f169ca3..b29e2436a3e 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_data_fetched_select_project_button.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_data_fetched_select_project_button.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_initial.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_initial.png
index d80b983d894..fed9f065d4b 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_initial.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_initial.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config.png
index 5d19a8117fb..5d79e98f36b 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config_import_run_button.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config_import_run_button.png
index a8607387d60..6d61b37a20b 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config_import_run_button.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config_import_run_button.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config_test.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config_test.png
index 9c2b4bc96fb..3fab17683aa 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config_test.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_new_config_test.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_select_projects_modal.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_select_projects_modal.png
index c00066aa7bb..34a2ed4638d 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_select_projects_modal.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_select_projects_modal.png differ
diff --git a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_start_import_button.png b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_start_import_button.png
index df375f2bd83..53560f55121 100644
Binary files a/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_start_import_button.png and b/docs/installation-and-operations/jira-migration/openproject_admin_import_jira_import_start_import_button.png differ
diff --git a/docs/release-notes/17-3-0/README.md b/docs/release-notes/17-3-0/README.md
index 14da04ddf23..b181388f586 100644
--- a/docs/release-notes/17-3-0/README.md
+++ b/docs/release-notes/17-3-0/README.md
@@ -207,7 +207,7 @@ We want to thank Community member [@cheezzz](https://github.com/cheezzz) for con
 - Bugfix: Sharing permission dependencies are not migrated \[[#72801](https://community.openproject.org/wp/72801)\]
 - Bugfix: Attribute help text not shown on project home page (overview tab) \[[#72807](https://community.openproject.org/wp/72807)\]
 - Bugfix: Provide more details when project with identifier exists in OpenProject \[[#72809](https://community.openproject.org/wp/72809)\]
-- Bugfix: No line break in table cells after ordered/undordered/task list \[[#72846](https://community.openproject.org/wp/72846)\]
+- Bugfix: No line break in table cells after ordered/unordered/task list \[[#72846](https://community.openproject.org/wp/72846)\]
 - Bugfix: Right side bar from Overview page is read out before main page content \[[#72850](https://community.openproject.org/wp/72850)\]
 - Bugfix: Cannot accept meeting series invite (because newer version of the appointment already exists) \[[#72865](https://community.openproject.org/wp/72865)\]
 - Bugfix: Template drop-down is not showing if user starts meeting creation from global meeting index \[[#72873](https://community.openproject.org/wp/72873)\]
diff --git a/docs/release-notes/17-4-0/README.md b/docs/release-notes/17-4-0/README.md
index 9ec9a779c70..7faf2a5a2b5 100644
--- a/docs/release-notes/17-4-0/README.md
+++ b/docs/release-notes/17-4-0/README.md
@@ -249,7 +249,7 @@ For more information, please see the [GitHub advisory #GHSA-p9gq-hrgh-2645](http
 - Bugfix: NoMethodError in Calendar::ICalController#show \[[#71354](https://community.openproject.org/wp/71354)\]
 - Bugfix: User cannot create a WP with auto generated subject \[[#72207](https://community.openproject.org/wp/72207)\]
 - Bugfix: Backlogs: Not able to navigate through the more menu with arrows \[[#72460](https://community.openproject.org/wp/72460)\]
-- Bugfix: Missing feedback (sucess message) on deleting versions \[[#72719](https://community.openproject.org/wp/72719)\]
+- Bugfix: Missing feedback (success message) on deleting versions \[[#72719](https://community.openproject.org/wp/72719)\]
 - Bugfix: Error 500 when trying to delete a work package with unit costs on a relative URL root \[[#72857](https://community.openproject.org/wp/72857)\]
 - Bugfix: SCIM User API returns duplicate records \[[#73431](https://community.openproject.org/wp/73431)\]
 - Bugfix: FieldsetGroups are missing descriptions \[[#73501](https://community.openproject.org/wp/73501)\]
diff --git a/docs/release-notes/17-4-0/openproject-17-4-backlog-bucket-create.png b/docs/release-notes/17-4-0/openproject-17-4-backlog-bucket-create.png
index fb2c42af301..96dd9cb4ce6 100644
Binary files a/docs/release-notes/17-4-0/openproject-17-4-backlog-bucket-create.png and b/docs/release-notes/17-4-0/openproject-17-4-backlog-bucket-create.png differ
diff --git a/docs/release-notes/17-4-0/openproject-17-4-backlog-sprints-button-highlighted.png b/docs/release-notes/17-4-0/openproject-17-4-backlog-sprints-button-highlighted.png
index e11e7485434..8f87d496ba2 100644
Binary files a/docs/release-notes/17-4-0/openproject-17-4-backlog-sprints-button-highlighted.png and b/docs/release-notes/17-4-0/openproject-17-4-backlog-sprints-button-highlighted.png differ
diff --git a/docs/release-notes/17-4-0/openproject-17-4-jira-migrator-custom-fields-work-package.png b/docs/release-notes/17-4-0/openproject-17-4-jira-migrator-custom-fields-work-package.png
index fd20267cd2a..f0780f5e551 100644
Binary files a/docs/release-notes/17-4-0/openproject-17-4-jira-migrator-custom-fields-work-package.png and b/docs/release-notes/17-4-0/openproject-17-4-jira-migrator-custom-fields-work-package.png differ
diff --git a/docs/release-notes/17-4-0/openproject-17-4-my-meetings-project-home-highlighted.png b/docs/release-notes/17-4-0/openproject-17-4-my-meetings-project-home-highlighted.png
index b56a1dad74a..c7fc0f43921 100644
Binary files a/docs/release-notes/17-4-0/openproject-17-4-my-meetings-project-home-highlighted.png and b/docs/release-notes/17-4-0/openproject-17-4-my-meetings-project-home-highlighted.png differ
diff --git a/docs/release-notes/17-4-0/openproject-17-4-workflow-copy-to-roles.png b/docs/release-notes/17-4-0/openproject-17-4-workflow-copy-to-roles.png
index 096d4a87227..6eddc767272 100644
Binary files a/docs/release-notes/17-4-0/openproject-17-4-workflow-copy-to-roles.png and b/docs/release-notes/17-4-0/openproject-17-4-workflow-copy-to-roles.png differ
diff --git a/docs/release-notes/17-4-0/openproject-jira-migrator-beta.png b/docs/release-notes/17-4-0/openproject-jira-migrator-beta.png
index 7498854ec44..23c49ebe892 100644
Binary files a/docs/release-notes/17-4-0/openproject-jira-migrator-beta.png and b/docs/release-notes/17-4-0/openproject-jira-migrator-beta.png differ
diff --git a/docs/release-notes/17-4-0/openproject-jira-migrator-custom-fields-comparison.png b/docs/release-notes/17-4-0/openproject-jira-migrator-custom-fields-comparison.png
index c4f268966cb..ce3006f10da 100644
Binary files a/docs/release-notes/17-4-0/openproject-jira-migrator-custom-fields-comparison.png and b/docs/release-notes/17-4-0/openproject-jira-migrator-custom-fields-comparison.png differ
diff --git a/docs/release-notes/17-5-0/README.md b/docs/release-notes/17-5-0/README.md
index 810a3ca3c5c..7ef9065fb60 100644
--- a/docs/release-notes/17-5-0/README.md
+++ b/docs/release-notes/17-5-0/README.md
@@ -93,11 +93,11 @@ In these Release Notes, we will give an overview of important feature changes. A
 - Bugfix: Lists of work packages should sort correctly by semantic id \[[#74156](https://community.openproject.org/wp/74156)\]
 - Bugfix: Automatically converting project identifiers should not lead to usage of reserved keywords \[[#74161](https://community.openproject.org/wp/74161)\]
 - Bugfix: Moving work packages after switching to semantic and back should not lead to errors \[[#74192](https://community.openproject.org/wp/74192)\]
-- Bugfix: Cancel occurence action item is called &#39;Delete&#39; on My Meetings page and Meeting index page &#39;Past&#39; tab \[[#74303](https://community.openproject.org/wp/74303)\]
+- Bugfix: Cancel occurrence action item is called &#39;Delete&#39; on My Meetings page and Meeting index page &#39;Past&#39; tab \[[#74303](https://community.openproject.org/wp/74303)\]
 - Bugfix: User cannot restore a cancelled occurrence if series has a deleted WP on the agenda \[[#74304](https://community.openproject.org/wp/74304)\]
 - Bugfix: Show default section more clearly when using the section selector for a meeting with no sections \[[#74321](https://community.openproject.org/wp/74321)\]
 - Bugfix: Inserting &quot;#&quot; inside text removes content after cursor \[[#74325](https://community.openproject.org/wp/74325)\]
-- Bugfix: Сards converting to hash links on copy-paste and DnD \[[#74327](https://community.openproject.org/wp/74327)\]
+- Bugfix: Cards converting to hash links on copy-paste and DnD \[[#74327](https://community.openproject.org/wp/74327)\]
 - Bugfix: Type colors are not applied correctly at the beginning \[[#74330](https://community.openproject.org/wp/74330)\]
 - Bugfix: Impossible to open work packages list from the sidebar after visiting team planner \[[#74331](https://community.openproject.org/wp/74331)\]
 - Bugfix: Inconsistent contrast for type colors when switching themes \[[#74332](https://community.openproject.org/wp/74332)\]
diff --git a/docs/system-admin-guide/authentication/login-registration-settings/openproject_system_admin_guide_authentication_settings_sso_tab.png b/docs/system-admin-guide/authentication/login-registration-settings/openproject_system_admin_guide_authentication_settings_sso_tab.png
index 4acbb1c8e2e..c6afa0df617 100644
Binary files a/docs/system-admin-guide/authentication/login-registration-settings/openproject_system_admin_guide_authentication_settings_sso_tab.png and b/docs/system-admin-guide/authentication/login-registration-settings/openproject_system_admin_guide_authentication_settings_sso_tab.png differ
diff --git a/docs/system-admin-guide/integrations/github-integration/README.md b/docs/system-admin-guide/integrations/github-integration/README.md
index 477242d8b4a..c0381cc4482 100644
--- a/docs/system-admin-guide/integrations/github-integration/README.md
+++ b/docs/system-admin-guide/integrations/github-integration/README.md
@@ -69,7 +69,7 @@ You can also define a webhook secret shared between GitHub and OpenProject. When
 
 Click **Save**.
 
-![Administration settings to specify webhook secret for GitHub integraiton in OpenProject](openproject-system-guide-github-webhook-secret.png)
+![Administration settings to specify webhook secret for GitHub integration in OpenProject](openproject-system-guide-github-webhook-secret.png)
 
 Finally you will need to activate the GitHub module under [Project settings](../../../user-guide/projects/project-settings/modules/) so that all information pulling through from GitHub will be shown in the work packages.
 
diff --git a/docs/system-admin-guide/integrations/github-integration/openproject-system-guide-github-webhook-secret.png b/docs/system-admin-guide/integrations/github-integration/openproject-system-guide-github-webhook-secret.png
index c83021bef3b..223a59eed6b 100644
Binary files a/docs/system-admin-guide/integrations/github-integration/openproject-system-guide-github-webhook-secret.png and b/docs/system-admin-guide/integrations/github-integration/openproject-system-guide-github-webhook-secret.png differ
diff --git a/docs/system-admin-guide/integrations/gitlab-integration/gitlab-tab.png b/docs/system-admin-guide/integrations/gitlab-integration/gitlab-tab.png
index 3358cadd51c..ef07e492e32 100644
Binary files a/docs/system-admin-guide/integrations/gitlab-integration/gitlab-tab.png and b/docs/system-admin-guide/integrations/gitlab-integration/gitlab-tab.png differ
diff --git a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-activity-tab.png b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-activity-tab.png
index 43b7257ac34..bf4c0697b44 100644
Binary files a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-activity-tab.png and b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-activity-tab.png differ
diff --git a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-git-snippets.png b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-git-snippets.png
index 0103d7b95f7..8b58515cc8b 100644
Binary files a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-git-snippets.png and b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-git-snippets.png differ
diff --git a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-gitlab-content-role-permission.png b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-gitlab-content-role-permission.png
index 7095f9b58c1..5493c2cc4d2 100644
Binary files a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-gitlab-content-role-permission.png and b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-gitlab-content-role-permission.png differ
diff --git a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-project-member.png b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-project-member.png
index 4e63a7f6f4b..b252ebf70e4 100644
Binary files a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-project-member.png and b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-project-member.png differ
diff --git a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-project-modules.png b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-project-modules.png
index 958e71302a5..fb23ca0f5b7 100644
Binary files a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-project-modules.png and b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-project-modules.png differ
diff --git a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-role.png b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-role.png
index e489ab4b199..c4cc5c8cfda 100644
Binary files a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-role.png and b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-integration-role.png differ
diff --git a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-webhook-secret.png b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-webhook-secret.png
index 8eb9dfcc5bb..7f75f559a90 100644
Binary files a/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-webhook-secret.png and b/docs/system-admin-guide/integrations/gitlab-integration/openproject-system-guide-gitlab-webhook-secret.png differ
diff --git a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy_to_roles.png b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy_to_roles.png
index 8f9cda20216..9b064960dfc 100644
Binary files a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy_to_roles.png and b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy_to_roles.png differ
diff --git a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy_type.png b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy_type.png
index b90adf7ebc4..b2872296ca6 100644
Binary files a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy_type.png and b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy_type.png differ
diff --git a/docs/system-admin-guide/openproject_system_administration_start_page.png b/docs/system-admin-guide/openproject_system_administration_start_page.png
index ded8a9ec95f..e28c8750d17 100644
Binary files a/docs/system-admin-guide/openproject_system_administration_start_page.png and b/docs/system-admin-guide/openproject_system_administration_start_page.png differ
diff --git a/docs/user-guide/account-settings/openproject_account_settings_change_new_password.png b/docs/user-guide/account-settings/openproject_account_settings_change_new_password.png
index 7cfc69ec21e..ab9effaf07f 100644
Binary files a/docs/user-guide/account-settings/openproject_account_settings_change_new_password.png and b/docs/user-guide/account-settings/openproject_account_settings_change_new_password.png differ
diff --git a/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png b/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png
index 09e7fc09ec3..aeb3a943129 100644
Binary files a/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png and b/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png differ
diff --git a/docs/user-guide/account-settings/openproject_account_settings_email_reminders1.png b/docs/user-guide/account-settings/openproject_account_settings_email_reminders1.png
index 2386a465acb..595880a108f 100644
Binary files a/docs/user-guide/account-settings/openproject_account_settings_email_reminders1.png and b/docs/user-guide/account-settings/openproject_account_settings_email_reminders1.png differ
diff --git a/docs/user-guide/account-settings/openproject_account_settings_notification_settings.png b/docs/user-guide/account-settings/openproject_account_settings_notification_settings.png
index f7af27139d5..c2cbbee033c 100644
Binary files a/docs/user-guide/account-settings/openproject_account_settings_notification_settings.png and b/docs/user-guide/account-settings/openproject_account_settings_notification_settings.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_add_bucket.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_add_bucket.png
index 5b490b4b164..34af40786e8 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_add_bucket.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_add_bucket.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_bucket.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_bucket.png
index 96a7523d937..dd6909351db 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_bucket.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_bucket.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_sprint_menu_item.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_sprint_menu_item.png
index 8830774ebff..a57172acc1f 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_sprint_menu_item.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlog_sprint_menu_item.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint.png
index e52952a1f98..224062bc844 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint_wp_in_progress.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint_wp_in_progress.png
index 844ca2c074c..603701c61fc 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint_wp_in_progress.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_complete_sprint_wp_in_progress.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_button_sprint.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_button_sprint.png
index 6dc764d9300..1523460c363 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_button_sprint.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_button_sprint.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_sprint.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_sprint.png
index 5d4d17bed75..a7c5615fc48 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_sprint.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_start_sprint.png differ
diff --git a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_story_points.png b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_story_points.png
index d99e807b22b..5ad678ea267 100644
Binary files a/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_story_points.png and b/docs/user-guide/backlogs-scrum/openproject_user_guide_backlogs_story_points.png differ
diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_duplicate_agenda_item2.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_duplicate_agenda_item2.png
index f803f3a48ce..9b45065f068 100644
Binary files a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_duplicate_agenda_item2.png and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_duplicate_agenda_item2.png differ
diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_duplicate_agenda_item_confirmation_dialog.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_duplicate_agenda_item_confirmation_dialog.png
index 4a59bc345a0..0e2ef41cc89 100644
Binary files a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_duplicate_agenda_item_confirmation_dialog.png and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_duplicate_agenda_item_confirmation_dialog.png differ
diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_move_agenda_item_confirmation_dialog.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_move_agenda_item_confirmation_dialog.png
index 1f09586b7d4..0408fefa86d 100644
Binary files a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_move_agenda_item_confirmation_dialog.png and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_move_agenda_item_confirmation_dialog.png differ
diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-Participating.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-Participating.png
index 572c168b8c7..a678a1d848e 100644
Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-Participating.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-Participating.png differ
diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-dateAlerts.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-dateAlerts.png
index d985a13e87e..c23dc337ce5 100644
Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-dateAlerts.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-dateAlerts.png differ
diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-fromNotificationCenter.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-fromNotificationCenter.png
index 81f6e7da38f..1de272a6c92 100644
Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-fromNotificationCenter.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-fromNotificationCenter.png differ
diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-nonPartipating.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-nonPartipating.png
index 6eb2ec890a2..53b11f4d431 100644
Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-nonPartipating.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-nonPartipating.png differ
diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-overall.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-overall.png
index 6b805bfa752..62fd9c550c9 100644
Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-overall.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-overall.png differ
diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-projectSpecific.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-projectSpecific.png
index 896d6917e11..55427c402a0 100644
Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-projectSpecific.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-projectSpecific.png differ
diff --git a/docs/user-guide/notifications/notification-settings/openproject_user_guide_project_specific_settings_button.png b/docs/user-guide/notifications/notification-settings/openproject_user_guide_project_specific_settings_button.png
index 6fc78ca9155..262f597163d 100644
Binary files a/docs/user-guide/notifications/notification-settings/openproject_user_guide_project_specific_settings_button.png and b/docs/user-guide/notifications/notification-settings/openproject_user_guide_project_specific_settings_button.png differ
diff --git a/docs/user-guide/notifications/notification-settings/openproject_user_guide_project_specific_settings_overlay.png b/docs/user-guide/notifications/notification-settings/openproject_user_guide_project_specific_settings_overlay.png
index 474e26120e2..10cc2e580a3 100644
Binary files a/docs/user-guide/notifications/notification-settings/openproject_user_guide_project_specific_settings_overlay.png and b/docs/user-guide/notifications/notification-settings/openproject_user_guide_project_specific_settings_overlay.png differ
diff --git a/docs/user-guide/projects/project-home/openproject_user_guide_project_home_new_overview_tab.png b/docs/user-guide/projects/project-home/openproject_user_guide_project_home_new_overview_tab.png
index a3df4b74d9a..d97f1fdda39 100644
Binary files a/docs/user-guide/projects/project-home/openproject_user_guide_project_home_new_overview_tab.png and b/docs/user-guide/projects/project-home/openproject_user_guide_project_home_new_overview_tab.png differ
diff --git a/docs/user-guide/projects/project-home/openproject_user_guide_project_new_home_page.png b/docs/user-guide/projects/project-home/openproject_user_guide_project_new_home_page.png
index b48ee00636f..7ea9ccee412 100644
Binary files a/docs/user-guide/projects/project-home/openproject_user_guide_project_new_home_page.png and b/docs/user-guide/projects/project-home/openproject_user_guide_project_new_home_page.png differ
diff --git a/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_create_meeting_widget.png b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_create_meeting_widget.png
index 088b494e581..7368e3e841f 100644
Binary files a/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_create_meeting_widget.png and b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_create_meeting_widget.png differ
diff --git a/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_all_meetings_widget.png b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_all_meetings_widget.png
index 58fb048868e..7f9d7597d06 100644
Binary files a/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_all_meetings_widget.png and b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_all_meetings_widget.png differ
diff --git a/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_meetings_widget.png b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_meetings_widget.png
index 8654dfc2585..a1011ed34a0 100644
Binary files a/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_meetings_widget.png and b/docs/user-guide/projects/project-home/project-widgets/openproject_user_guide_project_overview_meetings_widget.png differ
diff --git a/docs/user-guide/search/openproject_userguide_search_multispace_text.png b/docs/user-guide/search/openproject_userguide_search_multispace_text.png
index 16245ba143b..b118abb83bc 100644
Binary files a/docs/user-guide/search/openproject_userguide_search_multispace_text.png and b/docs/user-guide/search/openproject_userguide_search_multispace_text.png differ
diff --git a/docs/user-guide/search/openproject_userguide_search_partial_text.png b/docs/user-guide/search/openproject_userguide_search_partial_text.png
index 417ed9e5085..4d256eafb80 100644
Binary files a/docs/user-guide/search/openproject_userguide_search_partial_text.png and b/docs/user-guide/search/openproject_userguide_search_partial_text.png differ
diff --git a/frontend/src/app/features/boards/board/configuration-modal/board-configuration.modal.html b/frontend/src/app/features/boards/board/configuration-modal/board-configuration.modal.html
index 76ab53bb4db..3b99db93022 100644
--- a/frontend/src/app/features/boards/board/configuration-modal/board-configuration.modal.html
+++ b/frontend/src/app/features/boards/board/configuration-modal/board-configuration.modal.html
@@ -1,5 +1,5 @@
 <div
-  class="spot-modal loading-indicator--location"
+  class="spot-modal wp-table--configuration-modal loading-indicator--location"
   data-indicator-name="modal"
 >
   <div id="spotModalTitle" class="spot-modal--header">{{text.title}}</div>
diff --git a/frontend/src/app/features/boards/board/configuration-modal/tabs/highlighting-tab.component.html b/frontend/src/app/features/boards/board/configuration-modal/tabs/highlighting-tab.component.html
index 941d0856cfa..f66418a877e 100644
--- a/frontend/src/app/features/boards/board/configuration-modal/tabs/highlighting-tab.component.html
+++ b/frontend/src/app/features/boards/board/configuration-modal/tabs/highlighting-tab.component.html
@@ -2,7 +2,7 @@
   <form>
     <p [textContent]="text.highlighting_mode.description"></p>
 
-    <div class="form--field -full-width">
+    <div class="form--field">
       <div class="form--field-container">
         <label class="option-label">
           <input type="radio"
@@ -11,10 +11,17 @@
                  [value]="true"
                  name="entire_card_switch">
           <span [textContent]="text.highlighting_mode.entire_card_by"></span>
-          &ngsp;
+        </label>
+      </div>
+    </div>
+
+    <div class="form--field">
+      <div class="form--field-container">
+        <div class="form--select-container">
           <select (change)="updateMode($event.target.value)"
                   id="selected_attribute"
                   name="selected_attribute"
+                  [disabled]="highlightingMode === 'none'"
                   class="form--select form--inline-select option-label--select">
             <option [textContent]="text.highlighting_mode.type"
                     [selected]="lastEntireCardAttribute === 'type'"
@@ -23,10 +30,11 @@
                     [selected]="lastEntireCardAttribute === 'priority'"
                     value="priority"></option>
           </select>
-        </label>
+        </div>
       </div>
     </div>
-    <div class="form--field -full-width">
+
+    <div class="form--field">
       <div class="form--field-container">
         <label class="option-label">
           <input type="radio"
@@ -38,6 +46,5 @@
         </label>
       </div>
     </div>
-
   </form>
 </div>
diff --git a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/highlighting-tab.component.html b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/highlighting-tab.component.html
index 0b24ad62bae..bf360fd6034 100644
--- a/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/highlighting-tab.component.html
+++ b/frontend/src/app/features/work-packages/components/wp-table/configuration-modal/tabs/highlighting-tab.component.html
@@ -2,15 +2,19 @@
   <form>
     <p [textContent]="text.highlighting_mode.description"></p>
     <div class="form--field">
-      <label class="form--label">
-        <input type="radio"
-               [(ngModel)]="highlightingMode"
-               (change)="updateMode($event.target.value)"
-               value="inline"
-               name="highlighting_mode_switch">
-        <span [textContent]="text.highlighting_mode.inline"></span>&nbsp;
-      </label>
+      <div class="form--field-container">
+        <label class="option-label">
+          <input type="radio"
+                 [(ngModel)]="highlightingMode"
+                 (change)="updateMode($event.target.value)"
+                 value="inline"
+                 name="highlighting_mode_switch">
+          <span [textContent]="text.highlighting_mode.inline"></span>&nbsp;
+        </label>
+      </div>
+    </div>
 
+    <div class="form--field">
       <div class="form--field-container">
         <div class="form--select-container">
           <ng-select #highlightedAttributesNgSelect
@@ -32,21 +36,26 @@
     </div>
 
     <div class="form--field">
-      <label class="form--label">
-        <input type="radio"
-               [(ngModel)]="entireRowMode"
-               (change)="updateMode('entire-row')"
-               [value]="true"
-               name="entire_row_switch">
-        <span [textContent]="text.highlighting_mode.entire_row_by"></span>
-      </label>
+      <div class="form--field-container">
+        <label class="option-label">
+          <input type="radio"
+                 [(ngModel)]="entireRowMode"
+                 (change)="updateMode('entire-row')"
+                 [value]="true"
+                 name="entire_row_switch">
+          <span [textContent]="text.highlighting_mode.entire_row_by"></span>
+        </label>
+      </div>
+    </div>
 
+    <div class="form--field">
       <div class="form--field-container">
         <div class="form--select-container">
           <ng-select #rowHighlightNgSelect
                      [items]="availableRowHighlightedAttributes"
                      [(ngModel)]="lastEntireRowAttribute"
                      [clearable]="false"
+                     [disabled]="highlightingMode === 'inline' || highlightingMode === 'none'"
                      (open)="onOpen(rowHighlightNgSelect)"
                      (change)="updateMode($event.value)"
                      bindLabel="name"
@@ -60,14 +69,16 @@
     </div>
 
     <div class="form--field">
-      <label class="form--label">
-        <input type="radio"
-               [(ngModel)]="highlightingMode"
-               (change)="updateMode($event.target.value)"
-               value="none"
-               name="highlighting_mode_switch">
-        <span [textContent]="text.highlighting_mode.none"></span>
-      </label>
+      <div class="form--field-container">
+        <label class="option-label">
+          <input type="radio"
+                 [(ngModel)]="highlightingMode"
+                 (change)="updateMode($event.target.value)"
+                 value="none"
+                 name="highlighting_mode_switch">
+          <span [textContent]="text.highlighting_mode.none"></span>
+        </label>
+      </div>
     </div>
   </form>
 </div>
diff --git a/modules/boards/spec/features/board_highlighting_spec.rb b/modules/boards/spec/features/board_highlighting_spec.rb
index b0b35d16bf2..80e8d87c550 100644
--- a/modules/boards/spec/features/board_highlighting_spec.rb
+++ b/modules/boards/spec/features/board_highlighting_spec.rb
@@ -87,17 +87,17 @@ RSpec.describe "Work Package boards spec", :js, :selenium do
     expect(page).to have_css(".__hl_inline_type_#{type2.id}")
 
     # Highlight whole card by priority
-    board_page.change_board_highlighting "inline", "Priority"
+    board_page.change_board_highlighting "Entire card by", "Priority"
     expect(page).to have_css(".__hl_background_priority_#{priority.id}")
     expect(page).to have_css(".__hl_background_priority_#{priority2.id}")
 
     # Highlight whole card by type
-    board_page.change_board_highlighting "inline", "Type"
+    board_page.change_board_highlighting "Entire card by", "Type"
     expect(page).to have_css(".__hl_background_type_#{type.id}")
     expect(page).to have_css(".__hl_background_type_#{type2.id}")
 
     # Disable highlighting
-    board_page.change_board_highlighting "none"
+    board_page.change_board_highlighting "No highlighting"
     expect(page).to have_no_css(".__hl_background_type_#{type.id}")
     expect(page).to have_no_css(".__hl_background_type_#{type2.id}")
 
diff --git a/modules/boards/spec/features/support/board_page.rb b/modules/boards/spec/features/support/board_page.rb
index 6df9283083c..b63f2f0e9a8 100644
--- a/modules/boards/spec/features/support/board_page.rb
+++ b/modules/boards/spec/features/support/board_page.rb
@@ -374,9 +374,8 @@ module Pages
     def change_board_highlighting(mode, attribute = nil)
       click_dropdown_entry "Configure view"
 
-      if attribute.nil?
-        choose(option: mode)
-      else
+      choose mode
+      unless attribute.nil?
         select attribute, from: "selected_attribute"
       end
 
diff --git a/spec/controllers/work_packages/bulk_controller_spec.rb b/spec/controllers/work_packages/bulk_controller_spec.rb
index 72c297a2b98..888994da169 100644
--- a/spec/controllers/work_packages/bulk_controller_spec.rb
+++ b/spec/controllers/work_packages/bulk_controller_spec.rb
@@ -141,6 +141,39 @@ RSpec.describe WorkPackages::BulkController, with_settings: { journal_aggregatio
           it { assert_select "input", attributes: { name: "work_package[parent_id]" } }
         end
 
+        context "with work package list" do
+          context "with classic (numeric) identifiers" do
+            it "displays a hash-prefixed numeric id link for each work package" do
+              assert_select "ul li a", text: /\A#{Regexp.escape(work_package1.type.to_s)} ##{work_package1.id}\z/
+              assert_select "ul li a", text: /\A#{Regexp.escape(work_package2.type.to_s)} ##{work_package2.id}\z/
+            end
+          end
+
+          context "with semantic identifiers" do
+            let(:semantic_prefix) { "TESTPROJ" }
+
+            before do
+              allow(Setting::WorkPackageIdentifier).to receive_messages(semantic?: true, classic?: false)
+              work_package1.update_columns(identifier: "#{semantic_prefix}-1", sequence_number: 1)
+              work_package2.update_columns(identifier: "#{semantic_prefix}-2", sequence_number: 2)
+            end
+
+            it "displays the semantic identifier in each link" do
+              get :edit, params: { ids: [work_package1.id, work_package2.id] }
+
+              assert_select "ul li a", text: /#{semantic_prefix}-1/
+              assert_select "ul li a", text: /#{semantic_prefix}-2/
+            end
+
+            it "does not display a bare numeric id in the links" do
+              get :edit, params: { ids: [work_package1.id, work_package2.id] }
+
+              assert_select "ul li a", text: /##{work_package1.id}/, count: 0
+              assert_select "ul li a", text: /##{work_package2.id}/, count: 0
+            end
+          end
+        end
+
         context "custom_field" do
           describe "#type" do
             it { assert_select "input", attributes: { name: "work_package[custom_field_values][#{custom_field1.id}]" } }
diff --git a/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb b/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb
index d75790155a1..8ab8640f559 100644
--- a/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb
+++ b/spec/services/project_identifiers/revert_project_to_classic_service_spec.rb
@@ -109,5 +109,38 @@ RSpec.describe ProjectIdentifiers::RevertProjectToClassicService do
         expect(project.reload.identifier).to match(/\Aproject-[a-z0-9]{5}\z/)
       end
     end
+
+    context "when the classic slug from FriendlyId history is already taken by another project" do
+      let!(:blocking_project) { create(:project, identifier: "my-app") }
+
+      let!(:project) do
+        create(:project).tap do |p|
+          p.update_columns(identifier: "MYAPP", wp_sequence_counter: 0)
+          # Remove p's own initial slug so "my-app" is the only entry in its slug history.
+          # Without this, the factory slug (newer created_at) would be returned first by
+          # restore_identifier, the update would succeed, and the conflict path would never fire.
+          FriendlyId::Slug.where(sluggable_id: p.id, sluggable_type: "Project").delete_all
+          # blocking_project already owns the "my-app" FriendlyId slug; reassign it so that
+          # restore_identifier returns "my-app" and project.update! conflicts with blocking_project.
+          FriendlyId::Slug.where(slug: "my-app", sluggable_type: "Project").update_all(sluggable_id: p.id)
+        end
+      end
+
+      it "does not raise" do
+        expect { described_class.new(project).call }.not_to raise_error
+      end
+
+      it "assigns a project-NNNNN fallback identifier" do
+        described_class.new(project).call
+        expect(project.reload.identifier).to match(/\Aproject-[a-z0-9]{5}\z/)
+      end
+
+      it "logs a warning containing the project id and the conflicting identifier" do
+        allow(Rails.logger).to receive(:warn)
+        described_class.new(project).call
+        expect(Rails.logger).to have_received(:warn)
+          .with(a_string_including(project.id.to_s, "my-app"))
+      end
+    end
   end
 end
diff --git a/spec/support/components/work_packages/table_configuration/highlighting.rb b/spec/support/components/work_packages/table_configuration/highlighting.rb
index 2a1fdd59f7f..48cc72b039e 100644
--- a/spec/support/components/work_packages/table_configuration/highlighting.rb
+++ b/spec/support/components/work_packages/table_configuration/highlighting.rb
@@ -47,7 +47,7 @@ module Components
         choose "Entire row by"
 
         # Open select field
-        within(page.all(".form--field")[1]) do
+        within(page.all(".form--field")[3]) do
           page.find(".ng-input input").click
         end
         page.find(".ng-dropdown-panel .ng-option", text: label).click
@@ -59,7 +59,7 @@ module Components
         choose "Highlighted attribute(s)"
 
         # Open select field
-        within(page.all(".form--field")[0]) do
+        within(page.all(".form--field")[1]) do
           page.find(".ng-input input").click
         end
 
diff --git a/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb b/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb
index 2ff40ac9f34..0b65c2d61bb 100644
--- a/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb
+++ b/spec/workers/project_identifiers/revert_instance_to_classic_ids_job_spec.rb
@@ -112,6 +112,53 @@ RSpec.describe ProjectIdentifiers::RevertInstanceToClassicIdsJob do
             .to match(Projects::Identifier::CLASSIC_FORMAT)
         end
       end
+
+      context "when one project has a conflicting restored identifier" do
+        # project_before and project_after bracket the conflict project to confirm
+        # the find_each loop is not aborted — both must be processed.
+        let!(:project_before) do
+          create(:project).tap do |p|
+            p.update_columns(identifier: "BEFORE1")
+            FriendlyId::Slug.create!(sluggable: p, slug: "project-before")
+          end
+        end
+
+        # Holds "conflict-slug" as its current identifier, blocking project_conflict
+        # from reclaiming it.
+        let!(:blocking_project) { create(:project, identifier: "conflict-slug") }
+
+        let!(:project_conflict) do
+          create(:project).tap do |p|
+            p.update_columns(identifier: "CONFLICT1")
+            FriendlyId::Slug.where(sluggable_id: p.id, sluggable_type: "Project").delete_all
+            FriendlyId::Slug.where(slug: "conflict-slug", sluggable_type: "Project").update_all(sluggable_id: p.id)
+          end
+        end
+
+        let!(:project_after) do
+          create(:project).tap do |p|
+            p.update_columns(identifier: "AFTER1")
+            FriendlyId::Slug.create!(sluggable: p, slug: "project-after")
+          end
+        end
+
+        before do
+          allow(Setting::WorkPackageIdentifier).to receive_messages(classic?: true, semantic?: false)
+          described_class.new.perform
+        end
+
+        it "still reverts project_before (loop not aborted before the conflict)" do
+          expect(project_before.reload.identifier).to eq("project-before")
+        end
+
+        it "still reverts project_after (loop not aborted after the conflict)" do
+          expect(project_after.reload.identifier).to eq("project-after")
+        end
+
+        it "assigns project_conflict a project-NNNNN fallback identifier" do
+          expect(project_conflict.reload.identifier).to match(/\Aproject-[a-z0-9]{5}\z/)
+        end
+      end
     end
   end
 end