diff --git a/e2e/content-services/directives/restore-content-directive.e2e.ts b/e2e/content-services/directives/restore-content-directive.e2e.ts
index b3036e463f..e82619270f 100644
--- a/e2e/content-services/directives/restore-content-directive.e2e.ts
+++ b/e2e/content-services/directives/restore-content-directive.e2e.ts
@@ -287,10 +287,7 @@ describe('Restore content directive', () => {
 
             await browser.sleep(browser.params.testConfig.timeouts.index_search);
 
-            await navigationBarPage.navigateToContentServices();
-            await contentServicesPage.waitForTableBody();
-
-            await contentServicesPage.selectSite(publicSite.entry.title);
+            await navigationBarPage.goToSite(publicSite);
             await contentServicesPage.waitForTableBody();
             await contentServicesPage.checkContentIsDisplayed(siteFolder.entry.name);
             await contentServicesPage.openFolder(siteFolder.entry.name);
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html
index 8e80064152..62caaafc64 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html
@@ -33,8 +33,14 @@
             </adf-content-node-selector-panel>
     </mat-tab>
     <mat-tab *ngIf="canPerformLocalUpload()"
-             label="{{ 'NODE_SELECTOR.UPLOAD_FROM_DEVICE' | translate }}"
              [disabled]="isNotAllowedToUpload()">
+        <ng-template mat-tab-label>
+            {{ 'NODE_SELECTOR.UPLOAD_FROM_DEVICE' | translate }}
+            <mat-icon *ngIf="hasUploadError()"
+                      data-automation-id="adf-content-node-selector-disabled-tab-info-icon"
+                      matTooltip="{{ getWarningMessage() | translate }}">info
+            </mat-icon>
+        </ng-template>
         <adf-upload-drag-area [rootFolderId]="currentDirectoryId">
             <div class="adf-upload-dialog-container">
                 <adf-file-uploading-dialog [alwaysVisible]="true"></adf-file-uploading-dialog>
@@ -53,16 +59,6 @@
                 [disabled]="isNotAllowedToUpload()"
                 (error)="onError($event)">
             </adf-upload-button>
-            <ng-container>
-                <div class="adf-content-node-upload-button-warning-message" *ngIf="showingSearch">
-                    <mat-icon>warning</mat-icon>
-                    <span>{{ 'NODE_SELECTOR.UPLOAD_BUTTON_SEARCH_WARNING_MESSAGE' | translate }}</span>
-                </div>
-                <div class="adf-content-node-upload-button-warning-message" *ngIf="(!hasAllowableOperations && !showingSearch) && !isLoading">
-                    <mat-icon>warning</mat-icon>
-                    <span>{{ 'NODE_SELECTOR.UPLOAD_BUTTON_PERMISSION_WARNING_MESSAGE' | translate }}</span>
-                </div>
-            </ng-container>
         </ng-container>
     </div>
     <div>
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss
index 251cee15f2..23bcc9f205 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.scss
@@ -86,13 +86,4 @@
             }
         }
     }
-
-    .adf-content-node-upload-button-warning-message {
-        margin-left: 20px;
-        display: flex;
-        font-size: 12px;
-        mat-icon {
-            font-size: 16px;
-        }
-    }
 }
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts
index 33b5592fab..bf809d86eb 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts
@@ -284,10 +284,13 @@ describe('ContentNodeSelectorComponent', () => {
             selectTabByIndex(1);
 
             fixture.detectChanges();
-            const warningMessage = fixture.debugElement.query(By.css('.adf-content-node-upload-button-warning-message span'));
+            const infoMatIcon = fixture.debugElement.query(By.css('[data-automation-id="adf-content-node-selector-disabled-tab-info-icon"]'));
+            const iconTooltipMessage = infoMatIcon.attributes['ng-reflect-message'];
 
-            expect(warningMessage).not.toBeNull();
-            expect(warningMessage.nativeElement.innerText).toEqual('NODE_SELECTOR.UPLOAD_BUTTON_SEARCH_WARNING_MESSAGE');
+            const expectedMessage = 'NODE_SELECTOR.UPLOAD_BUTTON_SEARCH_WARNING_MESSAGE';
+
+            expect(component.getWarningMessage()).toEqual(expectedMessage);
+            expect(iconTooltipMessage).toEqual(expectedMessage.substring(0, 30));
         });
 
         it('should not be able to show warning message if it is not in search mode', () => {
@@ -339,10 +342,12 @@ describe('ContentNodeSelectorComponent', () => {
             selectTabByIndex(1);
 
             fixture.detectChanges();
-            const warningMessage = fixture.debugElement.query(By.css('.adf-content-node-upload-button-warning-message span'));
+            const infoMatIcon = fixture.debugElement.query(By.css('[data-automation-id="adf-content-node-selector-disabled-tab-info-icon"]'));
+            const iconTooltipMessage = infoMatIcon.attributes['ng-reflect-message'];
+            const expectedMessage = 'NODE_SELECTOR.UPLOAD_BUTTON_PERMISSION_WARNING_MESSAGE';
 
-            expect(warningMessage).not.toBeNull();
-            expect(warningMessage.nativeElement.innerText).toEqual('NODE_SELECTOR.UPLOAD_BUTTON_PERMISSION_WARNING_MESSAGE');
+            expect(component.getWarningMessage()).toEqual(expectedMessage);
+            expect(iconTooltipMessage).toEqual(expectedMessage.substring(0, 30));
         });
 
         it('should not be able to show warning message while loading documents', () => {
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
index ae71f9bf63..2feee3b2e1 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
@@ -146,4 +146,17 @@ export class ContentNodeSelectorComponent implements OnInit {
         return this.data?.showLocalUploadButton;
     }
 
+    getWarningMessage(): string {
+        return this.showingSearch ? 'NODE_SELECTOR.UPLOAD_BUTTON_SEARCH_WARNING_MESSAGE' :
+            (this.hasNoPermissionToUpload() ? 'NODE_SELECTOR.UPLOAD_BUTTON_PERMISSION_WARNING_MESSAGE' : '');
+    }
+
+    hasNoPermissionToUpload(): boolean {
+        return (!this.hasAllowableOperations && !this.showingSearch) && !this.isLoading;
+    }
+
+    hasUploadError(): boolean {
+        return this.showingSearch || this.hasNoPermissionToUpload();
+    }
+
 }