diff --git a/ng2-components/ng2-alfresco-core/README.md b/ng2-components/ng2-alfresco-core/README.md
index 01faf1dfc3..f992bb9665 100644
--- a/ng2-components/ng2-alfresco-core/README.md
+++ b/ng2-components/ng2-alfresco-core/README.md
@@ -355,6 +355,7 @@ export class MyComponent implements OnInit {
 | `heading` | {string} | optional | The header title. |
 | `isSelected` | {boolean} | optional | Define if the accordion group is selected or not. |
 | `headingIcon` | {string} | optional | The material design icon. |
+| `hasAccordionIcon` | {boolean} | optional | Define if the accordion (expand) icon needs to be shown or not, the default value is true |
 
 
 ## Authentication Service
diff --git a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.html b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.html
index f73c292a5e..9d5cd3d6e6 100644
--- a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.html
+++ b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.html
@@ -1,12 +1,10 @@
 <div class="adf-panel adf-panel-default" [ngClass]="{'adf-panel-open': isOpen}">
-    <div class="adf-panel-heading" [ngClass]="{'adf-panel-heading-selected': isSelected}">
-        <div (click)="onHeadingClick()">
-            <div id="heading-icon" *ngIf="hasHeadingIcon()" class="adf-panel-heading-icon">
-                <i class="material-icons">{{headingIcon}}</i>
-            </div>
-            <div id="heading-text" class="adf-panel-heading-text">{{heading}}</div>
+    <div class="adf-panel-heading" [ngClass]="{'adf-panel-heading-selected': isSelected}" (click)="onHeadingClick()">
+        <div id="heading-icon" *ngIf="hasHeadingIcon()" class="adf-panel-heading-icon">
+            <i class="material-icons">{{headingIcon}}</i>
         </div>
-        <div id="accordion-button" *ngIf="!isGroupContentEmpty()" class="adf-panel-heading-toggle" (click)="toggleOpen($event)">
+        <div id="heading-text" class="adf-panel-heading-text">{{heading}}</div>        
+        <div id="accordion-button" *ngIf="hasAccordionIcon" class="adf-panel-heading-toggle" (click)="toggleOpen($event)">
             <i class="material-icons">{{getAccordionIcon()}}</i>
         </div>
     </div>
diff --git a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.spec.ts
index baa8de6154..96453589f5 100644
--- a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.spec.ts
@@ -75,17 +75,6 @@ describe('AccordionGroupComponent', () => {
         });
     });
 
-    it('should hide expand icon by default', () => {
-        component.heading = 'Fake Header';
-        component.headingIcon = 'fake-icon';
-        component.contentWrapper.nativeElement.innerHTML = '';
-        fixture.whenStable().then(() => {
-            fixture.detectChanges();
-            let headerIcon = element.querySelector('#accordion-button');
-            expect(headerIcon).toBeNull();
-        });
-    });
-
     it('should show expand icon by default', () => {
         component.heading = 'Fake Header';
         component.headingIcon = 'fake-icon';
@@ -97,6 +86,18 @@ describe('AccordionGroupComponent', () => {
         });
     });
 
+    it('should hide expand icon', () => {
+        component.heading = 'Fake Header';
+        component.headingIcon = 'fake-icon';
+        component.hasAccordionIcon = false;
+        component.contentWrapper.nativeElement.innerHTML = '<a>Test</a>';
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            let headerIcon = element.querySelector('#accordion-button');
+            expect(headerIcon).toBeNull();
+        });
+    });
+
     it('should emit an event when a heading clicked', (done) => {
         component.heading = 'Fake Header';
         fixture.detectChanges();
diff --git a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts
index 3bad20fda4..bfe7cd99b4 100644
--- a/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/collapsable/accordion-group.component.ts
@@ -37,6 +37,9 @@ export class AccordionGroupComponent implements OnDestroy {
     @Input()
     headingIcon: string;
 
+    @Input()
+    hasAccordionIcon: boolean = true;
+
     @Output()
     headingClick: EventEmitter<any> = new EventEmitter<any>();
 
@@ -85,8 +88,4 @@ export class AccordionGroupComponent implements OnDestroy {
     onHeadingClick() {
         this.headingClick.emit(this.heading);
     }
-
-    isGroupContentEmpty() {
-        return this.contentWrapper.nativeElement.innerHTML.trim().length === 0;
-    }
 }