diff --git a/core/src/main/resources/hudson/model/Computer/builds.jelly b/core/src/main/resources/hudson/model/Computer/builds.jelly
index 805f32563d..4b0e166c9a 100644
--- a/core/src/main/resources/hudson/model/Computer/builds.jelly
+++ b/core/src/main/resources/hudson/model/Computer/builds.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName}">
     <st:include page="sidepanel.jelly" />
+    <l:breadcrumb title="${%Build History}" />
     <l:main-panel>
       <h1>
         ${%title(it.displayName)}
diff --git a/core/src/main/resources/hudson/model/Computer/configure.jelly b/core/src/main/resources/hudson/model/Computer/configure.jelly
index 0dfbe31b84..bd33078013 100644
--- a/core/src/main/resources/hudson/model/Computer/configure.jelly
+++ b/core/src/main/resources/hudson/model/Computer/configure.jelly
@@ -31,6 +31,7 @@ THE SOFTWARE.
   <l:layout permission="${it.EXTENDED_READ}" title="${%title(it.displayName)}">
     <j:set var="readOnlyMode" value="${!it.hasPermission(it.CONFIGURE)}" />
     <st:include page="sidepanel.jelly"/>
+    <l:breadcrumb title="${%Configure}" />
     <l:main-panel>
       <f:form method="post" action="configSubmit" name="config" class="jenkins-form">
         <j:set var="instance" value="${it.node}" />
diff --git a/core/src/main/resources/hudson/model/Computer/delete.jelly b/core/src/main/resources/hudson/model/Computer/delete.jelly
index c2e9f63581..1660a5964d 100644
--- a/core/src/main/resources/hudson/model/Computer/delete.jelly
+++ b/core/src/main/resources/hudson/model/Computer/delete.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout>
 		<st:include page="sidepanel.jelly" />
+		<l:breadcrumb title="${%Delete}" />
 		<l:main-panel>
 		  <form method="post" action="doDelete">
 		    ${%delete.agent(it.displayName)}
diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly
index aec2a86e20..2961982f37 100644
--- a/core/src/main/resources/hudson/model/Computer/index.jelly
+++ b/core/src/main/resources/hudson/model/Computer/index.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName}">
     <st:include page="sidepanel.jelly" />
+    <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
     <l:main-panel>
 
       <!-- temporarily offline switch -->
diff --git a/core/src/main/resources/hudson/model/Computer/load-statistics.jelly b/core/src/main/resources/hudson/model/Computer/load-statistics.jelly
index 7a4a00865b..3b0cf1530b 100644
--- a/core/src/main/resources/hudson/model/Computer/load-statistics.jelly
+++ b/core/src/main/resources/hudson/model/Computer/load-statistics.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} Load Statistics">
     <st:include page="sidepanel.jelly" />
+    <l:breadcrumb title="${%Load Statistics}" />
     <l:main-panel>
       <st:include page="main.jelly" from="${it.loadStatistics}" />
     </l:main-panel>
diff --git a/core/src/main/resources/hudson/model/Computer/markOffline.jelly b/core/src/main/resources/hudson/model/Computer/markOffline.jelly
index c31f3e9070..4f45cbd11a 100644
--- a/core/src/main/resources/hudson/model/Computer/markOffline.jelly
+++ b/core/src/main/resources/hudson/model/Computer/markOffline.jelly
@@ -30,6 +30,7 @@ THE SOFTWARE.
 
   <l:layout title="${%title(it.displayName)}">
     <st:include page="sidepanel.jelly" />
+    <l:breadcrumb title="${%Mark offline}" />
     <l:main-panel>
       <l:hasPermission permission="${it.DISCONNECT}">
         <h2>${%title(it.displayName)}</h2>
diff --git a/core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly b/core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly
index b8a645a723..587057a464 100644
--- a/core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly
+++ b/core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly
@@ -26,6 +26,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${%title(it.displayName)}">
     <st:include page="sidepanel.jelly" />
+    <l:breadcrumb title="${%Update offline reason}" />
     <l:main-panel>
       <l:hasPermission permission="${it.DISCONNECT}">
         <h2>${%title(it.displayName)}</h2>
diff --git a/core/src/main/resources/hudson/model/ComputerSet/configure.jelly b/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
index 088742a7a2..6c52cca8ca 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
@@ -30,6 +30,7 @@ THE SOFTWARE.
   <l:layout permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%Node Monitoring Configuration}">
     <j:set var="readOnlyMode" value="${!app.hasPermission(app.MANAGE)}" />
     <st:include page="sidepanel.jelly" />
+    <l:breadcrumb title="${%Node Monitoring}" />
     <l:main-panel>
       <!-- to make the form field binding work -->
       <j:set var="instance" value="${it}" />
diff --git a/core/src/main/resources/hudson/model/ComputerSet/index.jelly b/core/src/main/resources/hudson/model/ComputerSet/index.jelly
index 52906cc5a0..7950aafaa9 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/index.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/index.jelly
@@ -29,6 +29,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
 <l:layout title="${%Nodes}">
   <st:include page="sidepanel.jelly" />
+  <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
   <l:main-panel>
     <l:app-bar title="${%Manage nodes and clouds}">
       <l:hasAdministerOrManage>
diff --git a/core/src/main/resources/hudson/model/ComputerSet/new.jelly b/core/src/main/resources/hudson/model/ComputerSet/new.jelly
index 02b96cbe29..5ee62b0e16 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/new.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/new.jelly
@@ -34,6 +34,7 @@ THE SOFTWARE.
   <j:getStatic var="createPermission" className="hudson.model.Computer" field="CREATE"/>
   <l:layout title="${%New node}" permission="${createPermission}" type="one-column">
     <st:include page="sidepanel.jelly" />
+    <l:breadcrumb title="${%New node}" />
     <l:main-panel>
       <j:invokeStatic var="slaves" className="hudson.slaves.NodeDescriptor" method="allInstantiable" />
       <n:form title="${%New node}" nameTitle="${%Node name}" copyTitle="${%Copy Existing Node}" copyNames="${it._slaveNames}"