diff --git a/src/addons/messages/components/conversation-info/conversation-info.html b/src/addons/messages/components/conversation-info/conversation-info.html
index 59f120624..c72e7b344 100644
--- a/src/addons/messages/components/conversation-info/conversation-info.html
+++ b/src/addons/messages/components/conversation-info/conversation-info.html
@@ -20,7 +20,7 @@
             <ion-label>
                 <div class="large-avatar">
                     <img class="avatar" [src]="conversation!.imageurl" core-external-content [alt]="conversation!.name"
-                        onError="this.src='assets/img/group-avatar.png'">
+                        onError="this.src='assets/img/group-avatar.svg'">
                 </div>
                 <h2>
                     <core-format-text [text]="conversation!.name" contextLevel="system" [contextInstanceId]="0"></core-format-text>
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html
index 06978fd47..2c85e5dbd 100644
--- a/src/addons/messages/pages/discussion/discussion.html
+++ b/src/addons/messages/pages/discussion/discussion.html
@@ -6,7 +6,7 @@
         <ion-title>
             <h1>
                 <img *ngIf="loaded && !otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage" alt=""
-                    onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation" [siteId]="siteId || null">
+                    onError="this.src='assets/img/group-avatar.svg'" core-external-content role="presentation" [siteId]="siteId || null">
                 <core-user-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" [user]="otherMember" [linkProfile]="false"
                     [checkOnline]="otherMember.showonlinestatus">
                 </core-user-avatar>
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html
index bfd14752d..5d6e5b57b 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.html
+++ b/src/addons/messages/pages/group-conversations/group-conversations.html
@@ -151,7 +151,7 @@
         <!-- Group conversation image. -->
         <ion-avatar slot="start" *ngIf="conversation.type == typeGroup">
             <img [src]="conversation.imageurl" [alt]="conversation.name" core-external-content
-                onError="this.src='assets/img/group-avatar.png'">
+                onError="this.src='assets/img/group-avatar.svg'">
         </ion-avatar>
 
         <!-- Avatar for individual conversations. -->
diff --git a/src/assets/img/grades/agg_mean.png b/src/assets/img/grades/agg_mean.png
deleted file mode 100644
index 78c8046df..000000000
Binary files a/src/assets/img/grades/agg_mean.png and /dev/null differ
diff --git a/src/assets/img/grades/agg_mean.svg b/src/assets/img/grades/agg_mean.svg
new file mode 100644
index 000000000..ac4368d15
--- /dev/null
+++ b/src/assets/img/grades/agg_mean.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-0.9 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M2.3 4.8 6.7 4c.8 1.2 1.4 2.6 1.7 4.1.8-1.1 1.4-2 1.9-2.5.6-.7 1-1.1 1.4-1.3.4-.2.8-.3 1.2-.3.5 0 .8.1 1.1.4.2.3.4.6.4 1s-.1.7-.4 1c-.2.3-.6.4-.9.4-.3 0-.6 0-.9-.1-.3-.1-.6-.1-.7-.1-.4 0-.7.1-1 .4-.6.3-1.2 1-1.8 2.1.7 2.5 1.3 4 1.7 4.6.3.3.5.5.8.5.2 0 .4-.1.6-.2.2-.2.6-.6 1.1-1.3l.5.3c-.7 1.2-1.5 2-2.2 2.5-.5.4-1.1.6-1.6.6s-1-.1-1.3-.4c-.4-.2-.7-.6-.9-1.2-.3-.5-.6-1.4-1-2.6-1 1.2-1.7 2.2-2.3 2.7-.6.6-1 .9-1.4 1.1s-.9.3-1.3.3-.8-.1-1-.4-.4-.5-.4-.9.1-.8.4-1.1c.3-.3.6-.4 1.1-.4.2 0 .5.1.8.2.4.2.7.3.9.3.2 0 .5-.1.7-.2.3-.1.6-.4 1-.8.1-.2.5-.7 1.1-1.6-.8-3-1.4-4.8-1.9-5.3-.2-.4-.6-.6-1-.6-.2 0-.5 0-.8.1v-.5zM6.5 0h7.3L13 2.6H5.7L6.5 0z" fill="#999"/></svg>
diff --git a/src/assets/img/grades/agg_sum.png b/src/assets/img/grades/agg_sum.png
deleted file mode 100644
index 7bcc0e43a..000000000
Binary files a/src/assets/img/grades/agg_sum.png and /dev/null differ
diff --git a/src/assets/img/grades/agg_sum.svg b/src/assets/img/grades/agg_sum.svg
new file mode 100644
index 000000000..9ebd5c23d
--- /dev/null
+++ b/src/assets/img/grades/agg_sum.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-1.9 0 16 16" preserveAspectRatio="xMinYMid meet" overflow="visible"><path d="M9.2 12.4c-.7.3-1.4.5-2.1.6H2.7l5.2-5.9L5.4 2H7c1.1 0 2 .1 2.6.3.5.2 1 .5 1.3 1 .2.4.3.7.3 1.7h.4l1.3-5H2v2l2.8 5.6L0 13v3h10.4l2.5-6h-.5c-1 1-2 1.8-3.2 2.4z" fill="#999"/></svg>
diff --git a/src/assets/img/group-avatar.png b/src/assets/img/group-avatar.png
deleted file mode 100644
index 2e336c95c..000000000
Binary files a/src/assets/img/group-avatar.png and /dev/null differ
diff --git a/src/assets/img/group-avatar.svg b/src/assets/img/group-avatar.svg
new file mode 100644
index 000000000..f20509e01
--- /dev/null
+++ b/src/assets/img/group-avatar.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" xmlns:bx="https://boxy-svg.com" preserveAspectRatio="xMinYMid meet"><path style="fill:#d8d8d8" d="M0 0h100v100H0z"/><path d="M36.62 49.666c-3.937.122-7.158 1.677-9.662 4.668h-4.885c-1.993 0-3.67-.493-5.031-1.477-1.361-.984-2.042-2.426-2.042-4.32 0-8.58 1.507-12.871 4.52-12.871.147 0 .675.256 1.588.767.91.509 2.095 1.025 3.555 1.549 1.456.522 2.903.783 4.337.783 1.627 0 3.244-.28 4.849-.838a18.11 18.11 0 0 0-.183 2.406c0 3.379.986 6.49 2.954 9.333Zm39.047 23.225c0 2.916-.888 5.219-2.661 6.909-1.775 1.688-4.133 2.533-7.074 2.533H34.068c-2.942 0-5.3-.845-7.073-2.533-1.774-1.69-2.662-3.993-2.662-6.909 0-1.288.043-2.547.128-3.773.085-1.227.255-2.554.511-3.975.255-1.421.576-2.74.965-3.955.39-1.216.912-2.401 1.569-3.556.656-1.155 1.408-2.138 2.26-2.953.851-.813 1.89-1.464 3.116-1.949 1.227-.488 2.584-.731 4.066-.731.243 0 .764.262 1.568.785.801.522 1.689 1.106 2.661 1.75.972.644 2.272 1.227 3.902 1.751 1.628.52 3.268.783 4.92.783 1.654 0 3.294-.263 4.922-.783 1.63-.524 2.93-1.107 3.902-1.751.972-.644 1.86-1.228 2.661-1.75.802-.523 1.325-.785 1.568-.785 1.484 0 2.839.243 4.066.731 1.226.485 2.265 1.136 3.116 1.949.852.815 1.603 1.798 2.26 2.953a18.707 18.707 0 0 1 1.568 3.556c.39 1.215.711 2.534.967 3.955.255 1.421.425 2.748.51 3.975a54.58 54.58 0 0 1 .128 3.773ZM38.333 26.333c0 2.577-.912 4.776-2.735 6.599-1.821 1.824-4.021 2.734-6.598 2.734s-4.777-.91-6.599-2.734c-1.824-1.823-2.734-4.022-2.734-6.599 0-2.575.91-4.776 2.734-6.599C24.223 17.912 26.423 17 29 17s4.777.912 6.598 2.734c1.823 1.823 2.735 4.024 2.735 6.599Zm25.667 14c0 3.865-1.368 7.164-4.101 9.899-2.736 2.734-6.035 4.102-9.9 4.102-3.863 0-7.164-1.368-9.898-4.102-2.733-2.735-4.102-6.034-4.102-9.899 0-3.865 1.369-7.164 4.102-9.897 2.734-2.735 6.035-4.103 9.898-4.103 3.865 0 7.164 1.368 9.9 4.103C62.632 33.169 64 36.468 64 40.333Zm21 8.204c0 1.894-.681 3.336-2.042 4.32-1.362.984-3.038 1.477-5.031 1.477h-4.885c-2.504-2.991-5.725-4.546-9.661-4.668 1.967-2.843 2.953-5.954 2.953-9.333 0-.705-.061-1.506-.183-2.406 1.605.558 3.222.838 4.849.838 1.434 0 2.88-.261 4.337-.783 1.46-.524 2.646-1.04 3.556-1.549.911-.511 1.44-.767 1.586-.767 3.013 0 4.521 4.291 4.521 12.871Zm-4.667-22.204c0 2.577-.911 4.776-2.734 6.599-1.823 1.824-4.023 2.734-6.599 2.734-2.578 0-4.777-.91-6.598-2.734-1.824-1.823-2.735-4.022-2.735-6.599 0-2.575.911-4.776 2.735-6.599C66.223 17.912 68.422 17 71 17c2.576 0 4.776.912 6.599 2.734 1.823 1.823 2.734 4.024 2.734 6.599Z" fill="#fff" bx:origin="-2.38412 -1.795421"/></svg>
diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts
index 91af997c6..b4d26bfa2 100644
--- a/src/core/features/grades/services/grades-helper.ts
+++ b/src/core/features/grades/services/grades-helper.ts
@@ -543,11 +543,11 @@ export class CoreGradesHelperProvider {
         text = text.replace('%2F', '/').replace('%2f', '/');
         if (text.indexOf('/agg_mean') > -1) {
             row.itemtype = 'agg_mean';
-            row.image = 'assets/img/grades/agg_mean.png';
+            row.image = 'assets/img/grades/agg_mean.svg';
             row.iconAlt = Translate.instant('core.grades.aggregatemean');
         } else if (text.indexOf('/agg_sum') > -1) {
             row.itemtype = 'agg_sum';
-            row.image = 'assets/img/grades/agg_sum.png';
+            row.image = 'assets/img/grades/agg_sum.svg';
             row.iconAlt = Translate.instant('core.grades.aggregatesum');
         } else if (text.indexOf('/outcomes') > -1 || text.indexOf('fa-tasks') > -1) {
             row.itemtype = 'outcome';
@@ -555,7 +555,7 @@ export class CoreGradesHelperProvider {
             row.iconAlt = Translate.instant('core.grades.outcome');
         } else if (text.indexOf('i/folder') > -1 || text.indexOf('fa-folder') > -1) {
             row.itemtype = 'category';
-            row.icon = 'fas-cubes';
+            row.icon = 'fas-folder';
             row.iconAlt = Translate.instant('core.grades.category');
         } else if (text.indexOf('/manual_item') > -1 || text.indexOf('fa-square-o') > -1) {
             row.itemtype = 'manual';