diff --git a/projects/aca-content/src/lib/components/details/details.component.html b/projects/aca-content/src/lib/components/details/details.component.html
index 0d553319f..ff3378f3a 100644
--- a/projects/aca-content/src/lib/components/details/details.component.html
+++ b/projects/aca-content/src/lib/components/details/details.component.html
@@ -13,7 +13,7 @@
           <span class="acs-details-breadcrumb-item">{{ 'APP.INFO_DRAWER.TITLE' | translate }}</span>
         </div>
         <div>
-          <button
+          <button *ngIf="!isNodeLocked"
                   mat-icon-button
                   (click)="openAspectDialog()"
                   [attr.title]="'CORE.METADATA.ACTIONS.EDIT_ASPECTS' | translate"
diff --git a/projects/aca-content/src/lib/components/details/details.component.ts b/projects/aca-content/src/lib/components/details/details.component.ts
index 956ad8f54..61f64c158 100644
--- a/projects/aca-content/src/lib/components/details/details.component.ts
+++ b/projects/aca-content/src/lib/components/details/details.component.ts
@@ -24,8 +24,8 @@
 
 import { Component, OnInit, ViewEncapsulation, OnDestroy, Input } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { ContentApiService, PageComponent, PageLayoutComponent, ToolbarComponent } from '@alfresco/aca-shared';
-import { NavigateToPreviousPage, SetSelectedNodesAction } from '@alfresco/aca-shared/store';
+import { ContentApiService, PageComponent, PageLayoutComponent, ToolbarComponent, isLocked } from '@alfresco/aca-shared';
+import { NavigateToPreviousPage, SetSelectedNodesAction, getAppSelection } from '@alfresco/aca-shared/store';
 import { Subject } from 'rxjs';
 import { BreadcrumbModule, PermissionManagerModule, NodeAspectService } from '@alfresco/adf-content-services';
 import { CommonModule } from '@angular/common';
@@ -36,6 +36,8 @@ import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { MatButtonModule } from '@angular/material/button';
 import { MetadataTabComponent } from '../info-drawer/metadata-tab/metadata-tab.component';
 import { CommentsTabComponent } from '../info-drawer/comments-tab/comments-tab.component';
+import { NodeActionsService } from '../../services/node-actions.service';
+import { NodeEntry } from '@alfresco/js-api';
 
 @Component({
   standalone: true,
@@ -66,10 +68,15 @@ export class DetailsComponent extends PageComponent implements OnInit, OnDestroy
   isLoading: boolean;
   onDestroy$ = new Subject<boolean>();
   activeTab = 1;
-  editAspectSupported = false;
-  hasAllowableOperations = false;
+  selectionState: NodeEntry;
+  isNodeLocked: boolean;
 
-  constructor(private route: ActivatedRoute, private contentApi: ContentApiService, private nodeAspectService: NodeAspectService) {
+  constructor(
+    private route: ActivatedRoute,
+    private contentApi: ContentApiService,
+    private nodeAspectService: NodeAspectService,
+    private nodeActionsService: NodeActionsService
+  ) {
     super();
   }
 
@@ -90,6 +97,14 @@ export class DetailsComponent extends PageComponent implements OnInit, OnDestroy
         this.store.dispatch(new SetSelectedNodesAction([{ entry: this.node }]));
       });
     });
+
+    this.store.select(getAppSelection).subscribe(({ file }) => {
+      this.selectionState = file;
+      const isNodeLockedFromStore = this.selection && isLocked(this.selectionState);
+      this.nodeActionsService.isNodeLocked().subscribe((isNodeLockedFromService) => {
+        this.isNodeLocked = isNodeLockedFromStore || isNodeLockedFromService;
+      });
+    });
   }
 
   setActiveTab(tabName: string) {
diff --git a/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts b/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
index 286277732..e6e6f5395 100644
--- a/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
+++ b/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
@@ -39,6 +39,7 @@ import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatIconModule } from '@angular/material/icon';
+import { NodeActionsService } from '../../../services/node-actions.service';
 
 @Component({
   standalone: true,
@@ -59,7 +60,7 @@ export class ToggleEditOfflineComponent implements OnInit {
   nodeTitle = '';
   isNodeLocked = false;
 
-  constructor(private store: Store<AppStore>, private alfrescoApiService: AlfrescoApiService) {
+  constructor(private store: Store<AppStore>, private alfrescoApiService: AlfrescoApiService, private nodeActionsService: NodeActionsService) {
     this.nodesApi = new NodesApi(this.alfrescoApiService.getInstance());
   }
 
@@ -119,6 +120,7 @@ export class ToggleEditOfflineComponent implements OnInit {
   }
 
   lockNode(nodeId: string) {
+    this.nodeActionsService.setNodeLocked(true);
     return this.nodesApi.lockNode(nodeId, {
       type: 'ALLOW_OWNER_CHANGES',
       lifetime: 'PERSISTENT'
@@ -126,6 +128,7 @@ export class ToggleEditOfflineComponent implements OnInit {
   }
 
   unlockNode(nodeId: string) {
+    this.nodeActionsService.setNodeLocked(false);
     return this.nodesApi.unlockNode(nodeId);
   }
 
diff --git a/projects/aca-content/src/lib/services/node-actions.service.ts b/projects/aca-content/src/lib/services/node-actions.service.ts
index 7b2c1493d..32edc6ade 100644
--- a/projects/aca-content/src/lib/services/node-actions.service.ts
+++ b/projects/aca-content/src/lib/services/node-actions.service.ts
@@ -24,7 +24,7 @@
 
 import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { Observable, Subject, of, zip, from } from 'rxjs';
+import { Observable, Subject, of, zip, from, BehaviorSubject } from 'rxjs';
 import { AlfrescoApiService, TranslationService, ThumbnailService } from '@alfresco/adf-core';
 import {
   DocumentListService,
@@ -49,6 +49,7 @@ export class NodeActionsService {
   contentMoved: Subject<any> = new Subject<any>();
   moveDeletedEntries: any[] = [];
   isSitesDestinationAvailable = false;
+  private isNodeLockedSubject: BehaviorSubject<boolean>;
 
   _nodesApi: NodesApi;
   get nodesApi(): NodesApi {
@@ -64,7 +65,9 @@ export class NodeActionsService {
     private apiService: AlfrescoApiService,
     private translation: TranslationService,
     private thumbnailService: ThumbnailService
-  ) {}
+  ) {
+    this.isNodeLockedSubject = new BehaviorSubject<boolean>(false);
+  }
 
   /**
    * Copy node list
@@ -88,6 +91,14 @@ export class NodeActionsService {
     return this.doBatchOperation(NodeAction.MOVE, contentEntities, permission, focusedElementOnCloseSelector);
   }
 
+  setNodeLocked(isLocked: boolean) {
+    this.isNodeLockedSubject.next(isLocked);
+  }
+
+  isNodeLocked(): Observable<boolean> {
+    return this.isNodeLockedSubject.asObservable();
+  }
+
   /**
    * General method for performing the given operation (copy|move) to multiple nodes
    *
diff --git a/projects/aca-content/src/lib/ui/overrides/adf-style-fixes.theme.scss b/projects/aca-content/src/lib/ui/overrides/adf-style-fixes.theme.scss
index 5a3514d2d..07de537da 100644
--- a/projects/aca-content/src/lib/ui/overrides/adf-style-fixes.theme.scss
+++ b/projects/aca-content/src/lib/ui/overrides/adf-style-fixes.theme.scss
@@ -12,3 +12,22 @@
     }
   }
 }
+
+.adf-info-drawer-layout-content .app-metadata-tab .adf-metadata-properties .mat-expansion-panel {
+  border: 1px solid var(--adf-metadata-property-panel-border-color);
+  border-radius: 12px;
+  margin-bottom: 12px;
+}
+
+.acs-details-container {
+  .mat-tab-body-content {
+    .adf-metadata-properties {
+      .mat-expansion-panel {
+        width: 755px;
+        border: 1px solid var(--adf-metadata-property-panel-border-color);
+        margin: 24px;
+        border-radius: 12px;
+      }
+    }
+  }
+}
diff --git a/projects/aca-content/src/lib/ui/variables/variables.scss b/projects/aca-content/src/lib/ui/variables/variables.scss
index a3d528e0f..9cf9bf6fc 100644
--- a/projects/aca-content/src/lib/ui/variables/variables.scss
+++ b/projects/aca-content/src/lib/ui/variables/variables.scss
@@ -38,6 +38,7 @@ $disabled-chip-background-color: #f5f5f5;
 $contrast-gray: #646569;
 $adf-metadata-property-panel-border-color: rgba(0, 0, 0, 0.12);
 $adf-metadata-buttons-background-color: rgba(33, 33, 33, 0.05);
+$adf-snackbar-message-background-color: #ba1b1b;
 
 // CSS Variables
 $defaults: (
@@ -80,7 +81,8 @@ $defaults: (
   --theme-disabled-chip-background-color: $disabled-chip-background-color,
   --theme-contrast-gray: $contrast-gray,
   --adf-metadata-property-panel-border-color: $adf-metadata-property-panel-border-color,
-  --adf-metadata-buttons-background-color: $adf-metadata-buttons-background-color
+  --adf-metadata-buttons-background-color: $adf-metadata-buttons-background-color,
+  --adf-snackbar-message-background-color: $adf-snackbar-message-background-color
 );
 
 // propagates SCSS variables into the CSS variables scope