diff --git a/lib/view/pages/files/files.dart b/lib/view/pages/files/files.dart
index 0573c14..9350579 100644
--- a/lib/view/pages/files/files.dart
+++ b/lib/view/pages/files/files.dart
@@ -114,7 +114,7 @@ class _FilesState extends State<Files> {
                   enabled: e != currentSortDirection,
                   child: Row(
                     children: [
-                      Icon(e ? Icons.text_rotate_up : Icons.text_rotation_down, color: Colors.black),
+                      Icon(e ? Icons.text_rotate_up : Icons.text_rotation_down, color: Theme.of(context).colorScheme.onSurface),
                       const SizedBox(width: 15),
                       Text(e ? "Aufsteigend" : "Absteigend")
                     ],
@@ -135,7 +135,7 @@ class _FilesState extends State<Files> {
                   enabled: key != currentSort,
                   child: Row(
                     children: [
-                      Icon(SortOptions.getOption(key).icon, color: Colors.black),
+                      Icon(SortOptions.getOption(key).icon, color: Theme.of(context).colorScheme.onSurface),
                       const SizedBox(width: 15),
                       Text(SortOptions.getOption(key).displayName)
                     ],
diff --git a/lib/view/pages/more/gradeAverages/gradeAverage.dart b/lib/view/pages/more/gradeAverages/gradeAverage.dart
index 08ffdbf..92baf79 100644
--- a/lib/view/pages/more/gradeAverages/gradeAverage.dart
+++ b/lib/view/pages/more/gradeAverages/gradeAverage.dart
@@ -68,14 +68,14 @@ class _GradeAverageState extends State<GradeAverage> {
             }, icon: const Icon(Icons.delete_forever)),
           ),
           PopupMenuButton<bool>(
-            enableFeedback: true,
             initialValue: gradeSystem,
             icon: const Icon(Icons.more_horiz),
             itemBuilder: (context) => [true, false].map((e) => PopupMenuItem<bool>(
               value: e,
-              enabled: e != gradeSystem,
               child: Row(
                 children: [
+                  Icon(e ? Icons.calculate_outlined : Icons.school_outlined, color: Theme.of(context).colorScheme.onSurface),
+                  const SizedBox(width: 15),
                   Text(e ? "Notensystem" : "Punktesystem"),
                 ],
               ),
@@ -102,8 +102,6 @@ class _GradeAverageState extends State<GradeAverage> {
               } else {
                 switchSystem();
               }
-
-
             },
           ),
         ],