diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.html
index ac2852a5a4ed..dda4d12d8652 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.html
@@ -6,7 +6,7 @@
 <wicket:panel>
 	<wicket:enclosure child="categoriesList">
 		<div wicket:id="toggleActions" class="float-end">
-			<a href="javascript:void(0);" class="button" id="toggleCategories" wicket:id="toggleCategoriesLink" aria-controls="gradeSummaryTable"><wicket:message key="label.toolbar.togglecategories"></wicket:message></a>
+			<a href="javascript:void(0);" class="btn-link si" id="toggleCategories" wicket:id="toggleCategoriesLink" aria-controls="gradeSummaryTable"><wicket:message key="label.toolbar.togglecategories"></wicket:message></a>
 			<a href="javascript:void(0);" class="gb-summary-expand-all" wicket:id="expandCategoriesLink" aria-controls="gradeSummaryTable"><wicket:message key="label.studentsummary.expandall"></wicket:message></a>
 			<a href="javascript:void(0);" class="gb-summary-collapse-all" wicket:id="collapseCategoriesLink" aria-controls="gradeSummaryTable"><wicket:message key="label.studentsummary.collapseall"></wicket:message></a>
 		</div>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
index 61445c068004..c0a1b9b592a4 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
@@ -121,9 +121,8 @@ public void onBeforeRender() {
 			@Override
 			protected void onInitialize() {
 				super.onInitialize();
-				if (GradeSummaryTablePanel.this.isGroupedByCategory) {
-					add(new AttributeAppender("class", " on"));
-				}
+				String iconCssClass = GradeSummaryTablePanel.this.isGroupedByCategory ? " si-check-square" : " si-empty-square";
+				add(new AttributeAppender("class", iconCssClass));
 				add(new AttributeModifier("aria-pressed", GradeSummaryTablePanel.this.isGroupedByCategory));
 			}
 
diff --git a/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss b/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss
index 330c30eeaf6b..1ad497e92dd3 100644
--- a/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss
+++ b/library/src/skins/default/src/sass/modules/tool/gradebook/_gradebook.scss
@@ -1282,14 +1282,15 @@
    *                      Gradebook Print styles                      *
    * **************************************************************** */
    
-   .gb-summary-expand-all,
-   .gb-summary-collapse-all,
-   .gb-summary-category-toggle,
-   #toggleCategories,
-   #gradeSummaryTable-sticky
-   .tablesorter-icon {
+  @media print {
+  
+  .gb-summary-expand-all,
+  .gb-summary-collapse-all,
+  .gb-summary-category-toggle,
+  #toggleCategories,
+  #gradeSummaryTable-sticky .tablesorter-icon {
     display: none;
-   }
+  }
 
   .gb-summary-grade-panel {
     height: auto !important;
@@ -1303,6 +1304,9 @@
     page-break-inside: avoid;
     page-break-after:auto;
   }
+  
+}
+
   /* ********************************************************************* *
    *                      Gradebook Settings styles                        *
    * ********************************************************************* */
diff --git a/library/src/skins/default/src/sass/modules/tool/gradebook/gradebook-print.css b/library/src/skins/default/src/sass/modules/tool/gradebook/gradebook-print.css
deleted file mode 100644
index 79cd079bcb11..000000000000
--- a/library/src/skins/default/src/sass/modules/tool/gradebook/gradebook-print.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* **************************************************************** *
- *                      Gradebook Print styles                      *
- * **************************************************************** */
- 
- .gb-summary-expand-all,
- .gb-summary-collapse-all,
- .gb-summary-category-toggle,
- #toggleCategories,
- #gradeSummaryTable-sticky
- .tablesorter-icon {
-  display: none;
- }
-
-.gb-summary-grade-panel {
-  height: auto !important;
-}
-
-#gradeSummaryTable {
-  page-break-inside: auto;
-}
-
-#gradeSummaryTable tr {
-  page-break-inside: avoid;
-  page-break-after:auto;
-}