diff --git a/WebApp/Components/Features/Calendar/Index.razor b/WebApp/Components/Features/Calendar/Index.razor
index 6ffac55..fa9c98a 100644
--- a/WebApp/Components/Features/Calendar/Index.razor
+++ b/WebApp/Components/Features/Calendar/Index.razor
@@ -6,7 +6,7 @@
 @using Heron.MudCalendar
 @inject IEventOccurrenceService EventOccurrenceService
 
-<PageHeader Title="Event Calendar" Description="View competition schedules and event occurrences">
+<PageHeader Title="Event Calendar" Description="View competition schedules and event occurrences" Icon="@AppIcons.EventCalendar">
     <ActionButtons>
         <MudButton StartIcon="@Icons.Material.Filled.ImportExport" Href="calendar/event-occurrences/import" Variant="Variant.Filled" Color="Color.Primary">Import</MudButton>
     </ActionButtons>
diff --git a/WebApp/Components/Features/Students/Index.razor b/WebApp/Components/Features/Students/Index.razor
index 9ae309e..5275d6c 100644
--- a/WebApp/Components/Features/Students/Index.razor
+++ b/WebApp/Components/Features/Students/Index.razor
@@ -11,7 +11,7 @@
     <ActionButtons>
         <MudButton StartIcon="@Icons.Material.Filled.Create" Href="students/create" Variant="Variant.Filled" Color="Color.Primary">Create New</MudButton>
         <MudButton StartIcon="@AppIcons.EventRank" Href="students/event-ranking" Variant="Variant.Outlined">Event Rankings</MudButton>
-        <MudButton StartIcon="@Icons.Material.Filled.AppRegistration" Href="students/teams" Variant="Variant.Outlined">Registration</MudButton>
+        <MudButton StartIcon="@AppIcons.Registration" Href="students/teams" Variant="Variant.Outlined">Registration</MudButton>
     </ActionButtons>
 </PageHeader>
 
diff --git a/WebApp/Components/Features/Students/Registration.razor b/WebApp/Components/Features/Students/Registration.razor
index cce183c..f6693f6 100644
--- a/WebApp/Components/Features/Students/Registration.razor
+++ b/WebApp/Components/Features/Students/Registration.razor
@@ -8,7 +8,7 @@
 @inject WebApp.LocalStorageService LocalStorage
 @inject ValidationService ValidationService
 
-<PageHeader Title="Registration">
+<PageHeader Title="Registration" Icon="@AppIcons.Registration">
     <ActionButtons>
         <MudButton StartIcon="@Icons.Material.Filled.FilterAlt"
                    Variant="@(_showRegionalOnly ? Variant.Filled : Variant.Outlined)"
diff --git a/WebApp/Components/Pages/Home.razor b/WebApp/Components/Pages/Home.razor
index 5117fc4..82de0cf 100644
--- a/WebApp/Components/Pages/Home.razor
+++ b/WebApp/Components/Pages/Home.razor
@@ -20,7 +20,7 @@
                 <strong>@Configuration["ChapterSettings:Name"]</strong>
             </MudText>
         </MudHidden>
-        <MudText Typo="Typo.h6" Color="Color.Secondary">
+        <MudText Typo="Typo.h6" Color="Color.Info">
             @Configuration["ChapterSettings:CompetitionYear"] Competition Year
         </MudText>
     </div>
@@ -109,7 +109,7 @@ else
                        Caption="Optimize meeting times"
                        NavigateUrl="/meeting-schedule"/>
 
-        <DashboardCard Icon="@Icons.Material.Filled.Event"
+        <DashboardCard Icon="@AppIcons.EventCalendar"
                        Title="Event Calendar"
                        Caption="Conference schedules"
                        NavigateUrl="/calendar"/>
@@ -119,17 +119,17 @@ else
         <MudText Typo="Typo.h4">Teams & Registration</MudText>
     </MudPaper>
     <MudGrid>
-        <DashboardCard Icon="@Icons.Material.Filled.AppRegistration"
-                       Title="Registration"
-                       Caption="View student registrations"
-                       NavigateUrl="/students/teams"/>
-
         <DashboardCard Icon="@AppIcons.Teams"
                        Title="Teams"
                        Count="@_teamCount"
                        Subtitle="Total Teams"
                        Caption="@($"{_groupTeamsCount} Team | {_individualTeamsCount} Individual")"
                        NavigateUrl="/teams" />
+
+        <DashboardCard Icon="@AppIcons.Registration"
+                       Title="Registration"
+                       Caption="View student registrations"
+                       NavigateUrl="/students/teams"/>
     </MudGrid>
 
     <MudPaper Elevation="0" Class="my-4">
diff --git a/WebApp/Components/Shared/Components/DashboardCard.razor b/WebApp/Components/Shared/Components/DashboardCard.razor
index 8a8ac4e..2457ec5 100644
--- a/WebApp/Components/Shared/Components/DashboardCard.razor
+++ b/WebApp/Components/Shared/Components/DashboardCard.razor
@@ -1,6 +1,6 @@
 @using Microsoft.AspNetCore.Components
 
-<MudItem xs="12" sm="6" md="3">
+<MudItem xs="12" sm="6" md="6">
     <MudCard Elevation="@(Emphasized ? 8 : 4)" Class="@CardClass" Style="@CardStyle" @onclick="HandleClick">
         <MudCardContent>
             <div class="d-flex align-center mb-2">
diff --git a/WebApp/Components/Shared/Layout/NavMenu.razor b/WebApp/Components/Shared/Layout/NavMenu.razor
index 379f13f..c44a769 100644
--- a/WebApp/Components/Shared/Layout/NavMenu.razor
+++ b/WebApp/Components/Shared/Layout/NavMenu.razor
@@ -10,12 +10,12 @@
 
         <MudNavGroup Title="Scheduling" Icon="@Icons.Material.Filled.CalendarMonth" Expanded="true">
             <MudNavLink Href="/meeting-schedule/" Icon="@AppIcons.Scheduler">Meeting Schedule</MudNavLink>
-            <MudNavLink Href="/calendar/" Icon="@Icons.Material.Filled.Event">Event Calendar</MudNavLink>
+            <MudNavLink Href="/calendar/" Icon="@AppIcons.EventCalendar">Event Calendar</MudNavLink>
         </MudNavGroup>
 
         <MudNavGroup Title="Teams & Registration" Icon="@Icons.Material.Outlined.Groups" Expanded="true">
-            <MudNavLink Href="/students/teams" Icon="@Icons.Material.Filled.AppRegistration">Registration</MudNavLink>
             <MudNavLink Href="/teams" Match="NavLinkMatch.All" Icon="@AppIcons.Teams">Teams</MudNavLink>
+            <MudNavLink Href="/students/teams" Icon="@AppIcons.Registration">Registration</MudNavLink>
         </MudNavGroup>
 
         <MudNavGroup Title="Team Building" Icon="@Icons.Material.Filled.GroupAdd" Expanded="false">
diff --git a/WebApp/Models/AppIcons.cs b/WebApp/Models/AppIcons.cs
index 9f3887f..4232369 100644
--- a/WebApp/Models/AppIcons.cs
+++ b/WebApp/Models/AppIcons.cs
@@ -12,6 +12,8 @@ namespace WebApp.Models
         public static string Events = Icons.Material.Filled.Dashboard;
         public static string Scheduler = Icons.Material.Filled.CalendarMonth;
         public static string Captain = Icons.Material.Filled.Star;
+        public static string Registration = Icons.Material.Filled.AppRegistration;
+        public static string EventCalendar = Icons.Material.Filled.Event;
         public static string LevelOfEffortIcon(int? loe)
         {