diff --git a/AideDeJeu/AideDeJeu/Views/MainShell.xaml b/AideDeJeu/AideDeJeu/Views/MainShell.xaml
index d966dc3c..894ad8b9 100644
--- a/AideDeJeu/AideDeJeu/Views/MainShell.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainShell.xaml
@@ -7,6 +7,7 @@
        xmlns:tools="clr-namespace:AideDeJeu.Tools"
        xmlns:vm="clr-namespace:AideDeJeu.ViewModels"
        xmlns:libvm="clr-namespace:AideDeJeu.ViewModels.Library"
+       xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
        x:Class="AideDeJeu.Views.MainShell"
        BackgroundColor="{DynamicResource HDWhite}"
        FlyoutBackgroundColor="{DynamicResource HDWhite}"
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml
index ea86ef20..4718be8e 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesPage.xaml
@@ -5,8 +5,10 @@
              xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers"
              xmlns:pcviews="clr-namespace:AideDeJeu.Views.PlayerCharacter"
+             xmlns:pcvm="clr-namespace:AideDeJeu.ViewModels.PlayerCharacter"
              x:Class="AideDeJeu.Views.PlayerCharacter.AbilitiesPage"
-             x:Name="This">
+             x:Name="This"
+             x:DataType="pcvm:PlayerCharacterEditorViewModel">
     <ContentPage.Resources>
         <ResourceDictionary>
             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
@@ -14,7 +16,7 @@
         </ResourceDictionary>
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" />
+        <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand}" CommandParameter="{Binding SelectedPlayerCharacter}" />
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <ScrollView Orientation="Vertical">
@@ -29,13 +31,13 @@
                     <RowDefinition Height="auto" />
                 </Grid.RowDefinitions>
                 <Frame Grid.Column="0" BorderColor="Black" Padding="2" VerticalOptions="Start">
-                    <ImageButton Source="rolling_dice_cup.png" Command="{Binding RollDicesMRickCommand}" />
+                    <ImageButton Source="rolling_dice_cup.png" Command="{Binding RollDicesMRickCommand}" BackgroundColor="White" />
                 </Frame>
                 <Frame Grid.Column="1" BorderColor="Black" Padding="2">
-                    <ImageButton Source="cubes.png" Command="{Binding RollDices2d6plus6Command}" />
+                    <ImageButton Source="cubes.png" Command="{Binding RollDices2d6plus6Command}" BackgroundColor="White" />
                 </Frame>
                 <Frame Grid.Column="2" BorderColor="Black" Padding="2">
-                    <ImageButton Source="trash_can.png" Command="{Binding ResetDicesCommand}" />
+                    <ImageButton Source="trash_can.png" Command="{Binding ResetDicesCommand}" BackgroundColor="White" />
                 </Frame>
                 <Frame Grid.Row="1" Grid.ColumnSpan="3" BorderColor="Black" Padding="2" Margin="10">
                     <Grid RowSpacing="10" Margin="15">
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml
index 7af24a79..fbbc79c2 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml
@@ -16,7 +16,7 @@
         </ResourceDictionary>
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" />
+        <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand}" CommandParameter="{Binding SelectedPlayerCharacter}" />
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical">
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml
index 5fef0bfb..a1176cd2 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml
@@ -16,7 +16,7 @@
         </ResourceDictionary>
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" />
+        <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand}" CommandParameter="{Binding SelectedPlayerCharacter}" />
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical">
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml
index 1d890885..cbe2dee1 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/FinalizePage.xaml
@@ -4,8 +4,10 @@
              xmlns:tools="clr-namespace:AideDeJeu.Tools"
              xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers"
+             xmlns:pcvm="clr-namespace:AideDeJeu.ViewModels.PlayerCharacter"
              x:Class="AideDeJeu.Views.PlayerCharacter.FinalizePage"
-             x:Name="This">
+             x:Name="This"
+             x:DataType="pcvm:PlayerCharacterEditorViewModel">
     <ContentPage.Resources>
         <ResourceDictionary>
             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
@@ -13,7 +15,7 @@
         </ResourceDictionary>
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" />
+        <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand}" CommandParameter="{Binding SelectedPlayerCharacter}" />
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical">