diff --git a/SchoolPower/Views/AssignmentsPage.xaml b/SchoolPower/Views/AssignmentsPage.xaml
index 7bc5f3a..5f936aa 100644
--- a/SchoolPower/Views/AssignmentsPage.xaml
+++ b/SchoolPower/Views/AssignmentsPage.xaml
@@ -94,6 +94,13 @@
             <controls:PageHeader 
                 Text="{x:Bind selectdeSubject}" x:Name="pageHeader" 
                 RelativePanel.AlignLeftWithPanel="True" RelativePanel.AlignRightWithPanel="True" RelativePanel.AlignTopWithPanel="True" >
+
+                <controls:PageHeader.PrimaryCommands>
+                    <AppBarButton
+                        Icon="Filter"
+                        Name="Filter"
+                        Label="Filter"/>
+                </controls:PageHeader.PrimaryCommands>
                 <controls:PageHeader.SecondaryCommands>
                     <AppBarButton 
                         Icon="Edit" 
diff --git a/SchoolPower/Views/SubjectsAssignmentsPage.xaml b/SchoolPower/Views/SubjectsAssignmentsPage.xaml
index 94d5840..5f78880 100644
--- a/SchoolPower/Views/SubjectsAssignmentsPage.xaml
+++ b/SchoolPower/Views/SubjectsAssignmentsPage.xaml
@@ -210,6 +210,10 @@
                         Label="Refresh" 
                         AutomationProperties.AcceleratorKey="F5"
                         Click="Refresh_But_Click" />
+                    <AppBarButton
+                        Icon="Filter"
+                        Name="Filter"
+                        Label="Filter"/>
                 </controls:PageHeader.PrimaryCommands>
                 <controls:PageHeader.SecondaryCommands>
                     <AppBarButton 
diff --git a/SchoolPower/Views/SubjectsAssignmentsPage.xaml.cs b/SchoolPower/Views/SubjectsAssignmentsPage.xaml.cs
index 2891916..6b728cc 100644
--- a/SchoolPower/Views/SubjectsAssignmentsPage.xaml.cs
+++ b/SchoolPower/Views/SubjectsAssignmentsPage.xaml.cs
@@ -8,6 +8,7 @@
 using Windows.UI.Xaml.Navigation;
 using Windows.System;
 using SchoolPower.Localization;
+using System.Diagnostics;
 
 namespace SchoolPower.Views {
     public sealed partial class SubjectsAssignmentsPage : Page {
@@ -187,12 +188,15 @@ private async void Page_Loaded(object sender, RoutedEventArgs e) {
             if (AdaptiveStates.CurrentState == Narrow && SubjectsListView.SelectedIndex >= 0) {
                 GoToDetailButton.Visibility = Visibility.Visible;
                 EditButton.Visibility = Visibility.Visible;
+                Filter.Visibility = Visibility.Visible;
             } else if (AdaptiveStates.CurrentState == Normal) {
                 GoToDetailButton.Visibility = Visibility.Collapsed;
                 EditButton.Visibility = Visibility.Collapsed;
+                Filter.Visibility = Visibility.Collapsed;
             } else if (AdaptiveStates.CurrentState == Narrow && SubjectsListView.SelectedIndex == -1) {
                 GoToDetailButton.Visibility = Visibility.Collapsed;
                 EditButton.Visibility = Visibility.Collapsed;
+                Filter.Visibility = Visibility.Collapsed;
             }
         }
 
@@ -241,6 +245,7 @@ private void SubjectsListView_SelectionChanged(object sender, SelectionChangedEv
                 if (AdaptiveStates.CurrentState == Normal) {
                     AssignmentsFrame.Navigate(typeof(AssignmentsPage), StudentData.SelectedSubjectName);
                     EditButton.Visibility = Visibility.Visible;
+                    Filter.Visibility = Visibility.Visible;
                 }
 
                 // narrow -> show button
@@ -259,10 +264,12 @@ private void AdaptiveStatesChanged(object sender, VisualStateChangedEventArgs e)
             if (AdaptiveStates.CurrentState == Narrow && SubjectsListView.SelectedIndex >= 0) {
                 GoToDetailButton.Visibility = Visibility.Visible;
                 EditButton.Visibility = Visibility.Collapsed;
+                Filter.Visibility = Visibility.Collapsed;
             } else if (AdaptiveStates.CurrentState == Normal && SubjectsListView.SelectedIndex >= 0) {
                 AssignmentsFrame.Navigate(typeof(AssignmentsPage), subjects[SubjectsListView.SelectedIndex].Name);
                 GoToDetailButton.Visibility = Visibility.Collapsed;
                 EditButton.Visibility = Visibility.Visible;
+                Filter.Visibility = Visibility.Visible;
             }
         }