From 83a9dbf67d1a00f65a58a1bb43a217e2c50b7cd1 Mon Sep 17 00:00:00 2001
From: MartinKamenov <martinkamenov10@gmail.com>
Date: Fri, 1 Feb 2019 10:35:08 +0200
Subject: [PATCH 1/2] chore(*): Switched expand/colapse icons to be same as in
 the hierarchical grid.

---
 .../igniteui-angular/src/lib/grids/grid/grid.component.html     | 2 +-
 .../src/lib/grids/grid/groupby-row.component.html               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
index d1a7a38ae48..92789190272 100644
--- a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
+++ b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
@@ -44,7 +44,7 @@
         <span *ngIf="hasMovableColumns && draggedColumn && pinnedColumns.length > 0" [igxColumnMovingDrop]="parentVirtDir" [attr.droppable]="true" id="left" class="igx-grid__scroll-on-drag-pinned" [style.left.px]="pinnedWidth"></span>
         <ng-container *ngIf="groupingExpressions.length > 0">
             <div class="igx-grid__header-indentation igx-grid__row-indentation--level-{{groupingExpressions.length}}" #headerGroupContainer>
-                <igx-icon role="button" class="igx-grid__group-expand-btn" (click)="toggleAllGroupRows()">reorder</igx-icon>
+                <igx-icon role="button" class="igx-grid__group-expand-btn" (click)="toggleAllGroupRows()">unfold_less</igx-icon>
             </div>
         </ng-container>
         <ng-container *ngIf="showRowCheckboxes">
diff --git a/projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.html b/projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.html
index 96e7b7d00fa..25e4bdf61e5 100644
--- a/projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.html
+++ b/projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.html
@@ -1,6 +1,6 @@
 <ng-container #defaultGroupRow>
     <div (click)="toggle()" class="igx-grid__grouping-indicator">
-        <igx-icon *ngIf="!expanded" fontSet="material">chevron_right</igx-icon>
+        <igx-icon *ngIf="!expanded" fontSet="material">expand_less</igx-icon>
         <igx-icon *ngIf="expanded" fontSet="material">expand_more</igx-icon>
     </div>
 

From a93a328733e91203c7e61a865f875fd46155f7e1 Mon Sep 17 00:00:00 2001
From: MartinKamenov <martinkamenov10@gmail.com>
Date: Fri, 1 Feb 2019 16:25:54 +0200
Subject: [PATCH 2/2] chore(*): Added correct icons for the global expanded
 state of the grid

---
 .../igniteui-angular/src/lib/grids/grid/grid.component.html   | 3 ++-
 .../src/lib/grids/grid/groupby-row.component.html             | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
index 92789190272..d704bd39347 100644
--- a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
+++ b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
@@ -44,7 +44,8 @@
         <span *ngIf="hasMovableColumns && draggedColumn && pinnedColumns.length > 0" [igxColumnMovingDrop]="parentVirtDir" [attr.droppable]="true" id="left" class="igx-grid__scroll-on-drag-pinned" [style.left.px]="pinnedWidth"></span>
         <ng-container *ngIf="groupingExpressions.length > 0">
             <div class="igx-grid__header-indentation igx-grid__row-indentation--level-{{groupingExpressions.length}}" #headerGroupContainer>
-                <igx-icon role="button" class="igx-grid__group-expand-btn" (click)="toggleAllGroupRows()">unfold_less</igx-icon>
+                <igx-icon *ngIf="groupsExpanded" role="button" class="igx-grid__group-expand-btn" (click)="toggleAllGroupRows()">unfold_less</igx-icon>
+                <igx-icon *ngIf="!groupsExpanded" role="button" class="igx-grid__group-expand-btn" (click)="toggleAllGroupRows()">unfold_more</igx-icon>
             </div>
         </ng-container>
         <ng-container *ngIf="showRowCheckboxes">
diff --git a/projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.html b/projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.html
index 25e4bdf61e5..a2d6d08b854 100644
--- a/projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.html
+++ b/projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.html
@@ -1,7 +1,7 @@
 <ng-container #defaultGroupRow>
     <div (click)="toggle()" class="igx-grid__grouping-indicator">
-        <igx-icon *ngIf="!expanded" fontSet="material">expand_less</igx-icon>
-        <igx-icon *ngIf="expanded" fontSet="material">expand_more</igx-icon>
+        <igx-icon *ngIf="!expanded" fontSet="material">expand_more</igx-icon>
+        <igx-icon *ngIf="expanded" fontSet="material">expand_less</igx-icon>
     </div>
 
     <div class="igx-grid__group-content" #groupContent>