diff --git a/src/sql/parts/jobManagement/common/media/jobs.css b/src/sql/parts/jobManagement/common/media/jobs.css
index acd85e9e42..d98d01a3d3 100644
--- a/src/sql/parts/jobManagement/common/media/jobs.css
+++ b/src/sql/parts/jobManagement/common/media/jobs.css
@@ -304,15 +304,15 @@ table.jobprevruns > tbody {
 	background-image: url('refresh_inverse.svg');
 }
 
-.actionbar-container .monaco-action-bar > ul.actions-container {
+.agent-actionbar-container .monaco-action-bar > ul.actions-container {
 	padding-top: 10px;
 }
 
-jobsview-component .actionbar-container {
+jobsview-component .agent-actionbar-container {
     height: 40px;
 }
 
-.actionbar-container .monaco-action-bar > ul.actions-container > li.action-item {
+.agent-actionbar-container .monaco-action-bar > ul.actions-container > li.action-item {
 	padding-left: 20px;
 }
 
diff --git a/src/sql/parts/jobManagement/views/alertsView.component.html b/src/sql/parts/jobManagement/views/alertsView.component.html
index f6c318521e..02e8f268e3 100644
--- a/src/sql/parts/jobManagement/views/alertsView.component.html
+++ b/src/sql/parts/jobManagement/views/alertsView.component.html
@@ -10,6 +10,6 @@
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>
 
-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>
 
 <div #jobalertsgrid class="jobalertsview-grid"></div>
diff --git a/src/sql/parts/jobManagement/views/jobHistory.component.html b/src/sql/parts/jobManagement/views/jobHistory.component.html
index adad1aadf2..e1bc3c38df 100644
--- a/src/sql/parts/jobManagement/views/jobHistory.component.html
+++ b/src/sql/parts/jobManagement/views/jobHistory.component.html
@@ -15,7 +15,7 @@
  </div>
 
 <!-- Actions -->
-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>
 
 <!-- Overview  -->
  <div class="overview-container">
diff --git a/src/sql/parts/jobManagement/views/jobHistory.css b/src/sql/parts/jobManagement/views/jobHistory.css
index 0017f58caa..3f100393a6 100644
--- a/src/sql/parts/jobManagement/views/jobHistory.css
+++ b/src/sql/parts/jobManagement/views/jobHistory.css
@@ -257,14 +257,14 @@ jobhistory-component > .jobhistory-heading-container > .icon.in-progress {
 	padding-left: 20px;
 }
 
-jobhistory-component > .actionbar-container .monaco-action-bar > ul.actions-container {
+jobhistory-component > .agent-actionbar-container .monaco-action-bar > ul.actions-container {
 	border-top: 3px solid #f4f4f4;
 }
 
-.vs-dark jobhistory-component > .actionbar-container .monaco-action-bar > ul.actions-container {
+.vs-dark jobhistory-component > .agent-actionbar-container .monaco-action-bar > ul.actions-container {
 	border-top: 3px solid #444444;
 }
 
-.hc-black jobhistory-component > .actionbar-container .monaco-action-bar > ul.actions-container {
+.hc-black jobhistory-component > .agent-actionbar-container .monaco-action-bar > ul.actions-container {
 	border-top: 3px solid #2b56f2;
 }
diff --git a/src/sql/parts/jobManagement/views/jobsView.component.html b/src/sql/parts/jobManagement/views/jobsView.component.html
index db488b549e..0d5f0e0f79 100644
--- a/src/sql/parts/jobManagement/views/jobsView.component.html
+++ b/src/sql/parts/jobManagement/views/jobsView.component.html
@@ -10,6 +10,6 @@
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>
 
-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>
 
 <div #jobsgrid class="jobview-grid"></div>
\ No newline at end of file
diff --git a/src/sql/parts/jobManagement/views/jobsView.component.ts b/src/sql/parts/jobManagement/views/jobsView.component.ts
index ebb8ae22d3..a945c13540 100644
--- a/src/sql/parts/jobManagement/views/jobsView.component.ts
+++ b/src/sql/parts/jobManagement/views/jobsView.component.ts
@@ -134,7 +134,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
 	}
 
 	public layout() {
-		let jobsViewToolbar = $('jobsview-component .actionbar-container').get(0);
+		let jobsViewToolbar = $('jobsview-component .agent-actionbar-container').get(0);
 		let statusBar = $('.part.statusbar').get(0);
 		if (jobsViewToolbar && statusBar) {
 			let toolbarBottom = jobsViewToolbar.getBoundingClientRect().bottom;
diff --git a/src/sql/parts/jobManagement/views/operatorsView.component.html b/src/sql/parts/jobManagement/views/operatorsView.component.html
index ae1bca50e4..6960603412 100644
--- a/src/sql/parts/jobManagement/views/operatorsView.component.html
+++ b/src/sql/parts/jobManagement/views/operatorsView.component.html
@@ -10,6 +10,6 @@
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>
 
-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>
 
 <div #operatorsgrid class="joboperatorsview-grid"></div>
diff --git a/src/sql/parts/jobManagement/views/proxiesView.component.html b/src/sql/parts/jobManagement/views/proxiesView.component.html
index 9680518ab3..7cb2bdf756 100644
--- a/src/sql/parts/jobManagement/views/proxiesView.component.html
+++ b/src/sql/parts/jobManagement/views/proxiesView.component.html
@@ -10,6 +10,6 @@
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>
 
-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>
 
 <div #proxiesgrid class="jobproxiesview-grid"></div>