diff --git a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html
index ef482a9822..d3ae12c426 100644
--- a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html
+++ b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html
@@ -7,7 +7,7 @@
          fxLayout="column"
          [cdkTrapFocus]="overlayMode"
          cdkTrapFocusAutoCapture>
-        <ng-content select="adf-alfresco-viewer-toolbar"></ng-content>
+        <ng-content select="adf-viewer-toolbar"></ng-content>
         <ng-container *ngIf="showToolbar && !toolbar">
             <adf-toolbar id="adf-alfresco-viewer-toolbar" class="adf-alfresco-viewer-toolbar">
                 <adf-toolbar-title>
diff --git a/lib/testing/src/lib/protractor/core/pages/viewer.page.ts b/lib/testing/src/lib/protractor/core/pages/viewer.page.ts
index dc184fbfaa..9a7013c21e 100644
--- a/lib/testing/src/lib/protractor/core/pages/viewer.page.ts
+++ b/lib/testing/src/lib/protractor/core/pages/viewer.page.ts
@@ -64,7 +64,7 @@ export class ViewerPage {
     imgViewer = $('adf-img-viewer');
     activeTab = $('div[class*="mat-tab-label-active"]');
     toolbarSwitch = $('#adf-switch-toolbar');
-    toolbar = $('#adf-viewer-toolbar');
+    toolbar = $('#adf-alfresco-viewer-toolbar');
     lastButton = $$('#adf-viewer-toolbar mat-toolbar > button[data-automation-id*="adf-toolbar-"]').last();
     goBackSwitch = $('#adf-switch-goback');
     canvasLayer = $$('.canvasWrapper > canvas').first();