diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
index 883fbf0d..318cbb9d 100644
--- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
+++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
@@ -131,6 +131,10 @@
   <ItemGroup>
     <None Include="Package.StoreAssociation.xml" />
     <Content Include="crystal_ball.png" />
+    <Content Include="dragon_head.png" />
+    <Content Include="funnel.png" />
+    <Content Include="icon.png" />
+    <Content Include="ic_launcher.png" />
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\LockScreenLogo.scale-100.png" />
     <Content Include="Assets\LockScreenLogo.scale-125.png" />
@@ -163,6 +167,11 @@
     <Content Include="Assets\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
     <Content Include="Assets\Wide310x150Logo.scale-400.png" />
+    <Content Include="round_star.png" />
+    <Content Include="settings_knobs.png" />
+    <Content Include="spell_book.png" />
+    <Content Include="stars_stack.png" />
+    <Content Include="wooden_sign.png" />
     <Content Include="xamarin_logo.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/AideDeJeu/AideDeJeu.UWP/crystal_ball.png b/AideDeJeu/AideDeJeu.UWP/crystal_ball.png
index a3f7d022..58cb4bad 100644
Binary files a/AideDeJeu/AideDeJeu.UWP/crystal_ball.png and b/AideDeJeu/AideDeJeu.UWP/crystal_ball.png differ
diff --git a/AideDeJeu/AideDeJeu.UWP/dragon_head.png b/AideDeJeu/AideDeJeu.UWP/dragon_head.png
new file mode 100644
index 00000000..771180fd
Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/dragon_head.png differ
diff --git a/AideDeJeu/AideDeJeu.UWP/funnel.png b/AideDeJeu/AideDeJeu.UWP/funnel.png
new file mode 100644
index 00000000..bbf710a6
Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/funnel.png differ
diff --git a/AideDeJeu/AideDeJeu.UWP/ic_launcher.png b/AideDeJeu/AideDeJeu.UWP/ic_launcher.png
new file mode 100644
index 00000000..4b40bb1a
Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/ic_launcher.png differ
diff --git a/AideDeJeu/AideDeJeu.UWP/icon.png b/AideDeJeu/AideDeJeu.UWP/icon.png
new file mode 100644
index 00000000..0bef109d
Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/icon.png differ
diff --git a/AideDeJeu/AideDeJeu.UWP/round_star.png b/AideDeJeu/AideDeJeu.UWP/round_star.png
new file mode 100644
index 00000000..0082578f
Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/round_star.png differ
diff --git a/AideDeJeu/AideDeJeu.UWP/settings_knobs.png b/AideDeJeu/AideDeJeu.UWP/settings_knobs.png
new file mode 100644
index 00000000..19140438
Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/settings_knobs.png differ
diff --git a/AideDeJeu/AideDeJeu.UWP/spell_book.png b/AideDeJeu/AideDeJeu.UWP/spell_book.png
new file mode 100644
index 00000000..6c570695
Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/spell_book.png differ
diff --git a/AideDeJeu/AideDeJeu.UWP/stars_stack.png b/AideDeJeu/AideDeJeu.UWP/stars_stack.png
new file mode 100644
index 00000000..6c59c304
Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/stars_stack.png differ
diff --git a/AideDeJeu/AideDeJeu.UWP/wooden_sign.png b/AideDeJeu/AideDeJeu.UWP/wooden_sign.png
new file mode 100644
index 00000000..6e97a1d5
Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/wooden_sign.png differ
diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
index aae48e1f..e52e5faa 100644
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@@ -344,6 +344,9 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resource.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="Views\BookmarksEditPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Update="Views\BookmarksPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml
new file mode 100644
index 00000000..01ea7eba
--- /dev/null
+++ b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:tools="clr-namespace:AideDeJeu.Tools"
+             x:Class="AideDeJeu.Views.BookmarksEditPage"
+             x:Name="This"
+             Title="Favoris">
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <tools:IntToBooleanConverter x:Key="IntToBooleanConverter" NonZeroValue="False" NullOrZeroValue="True" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
+    <ContentPage.Content>
+        <Grid BackgroundColor="{StaticResource bgtan}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Entry Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="FillAndExpand" />
+
+            <Image Grid.Column="1" Grid.Row="0" Source="settings_knobs.png">
+                <Image.GestureRecognizers>
+                    <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped" />
+                </Image.GestureRecognizers>
+            </Image>
+
+            <ListView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" x:Name="ItemsListView" ItemsSource="{Binding BookmarkCollection}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                            <Grid Padding="10">
+                                
+                                <Label Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3" Text="{Binding Name}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="16" />
+                                <Label Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Text="{Binding Link}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" />
+                                <Image Grid.Column="0" Grid.Row="2" BackgroundColor="#FF0000" WidthRequest="20" HeightRequest="20" />
+                                <Image Grid.Column="1" Grid.Row="2" BackgroundColor="#00FF00" WidthRequest="20" HeightRequest="20" />
+                                <Image Grid.Column="2" Grid.Row="2" BackgroundColor="#0000FF" WidthRequest="20" HeightRequest="20" />
+                            </Grid>
+                        </ViewCell>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+            <ActivityIndicator 
+                    Grid.Column="0" Grid.Row="0" 
+                    VerticalOptions="StartAndExpand"
+                    HorizontalOptions="End"
+                    Color="{StaticResource titlered}"
+                    IsRunning="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}" 
+                    IsVisible="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}">
+                <ActivityIndicator.WidthRequest>
+                    <OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="400" Android="50" />
+                </ActivityIndicator.WidthRequest>
+                <ActivityIndicator.HeightRequest>
+                    <OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="10" Android="50" />
+                </ActivityIndicator.HeightRequest>
+            </ActivityIndicator>
+        </Grid>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml.cs
new file mode 100644
index 00000000..480cbab7
--- /dev/null
+++ b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml.cs
@@ -0,0 +1,33 @@
+using AideDeJeu.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace AideDeJeu.Views
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class BookmarksEditPage : ContentPage
+	{
+		public BookmarksEditPage ()
+		{
+			InitializeComponent ();
+
+            BindingContext = DependencyService.Get<BookmarksViewModel>();
+        }
+
+        private async void TapGestureRecognizer_Tapped(object sender, EventArgs e)
+        {
+            await Navigation.PopAsync();
+        }
+
+        private async void ItemsListView_ItemTapped(object sender, ItemTappedEventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml
index 1439236b..a8ef2621 100644
--- a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml
@@ -21,7 +21,7 @@
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             
-            <Picker Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="FillAndExpand" ItemsSource="{Binding BookmarkCollectionNames, Mode=OneWay}" ItemDisplayBinding="{Binding Mode=OneWay}" SelectedIndex="{Binding BookmarkCollectionIndex, Mode=TwoWay}" />
+            <Picker Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="Fill" ItemsSource="{Binding BookmarkCollectionNames, Mode=OneWay}" ItemDisplayBinding="{Binding Mode=OneWay}" SelectedIndex="{Binding BookmarkCollectionIndex, Mode=TwoWay}" />
 
             <Image Grid.Column="1" Grid.Row="0" Source="settings_knobs.png">
                 <Image.GestureRecognizers>
diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs
index a6f0724f..21469b58 100644
--- a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml.cs
@@ -28,9 +28,9 @@ namespace AideDeJeu.Views
             await Main.Navigator.NavigateToLinkAsync(item.Link);
         }
 
-        private void TapGestureRecognizer_Tapped(object sender, EventArgs e)
+        private async void TapGestureRecognizer_Tapped(object sender, EventArgs e)
         {
-
+            await Navigation.PushAsync(new BookmarksEditPage());
         }
     }
 }
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
index a0d53493..675ec914 100644
--- a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
@@ -8,7 +8,7 @@
     x:Name="This" 
     Title="{Binding Title}">
     <MasterDetailPage.ToolbarItems>
-        <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star" Command="{Binding Main.Navigator.AddToFavoritesCommand}" />
+        <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" />
         <!--<ToolbarItem Name="DeepSearch" Text="Rechercher..." Order="Primary" Icon="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" />
         <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />-->
     </MasterDetailPage.ToolbarItems>
diff --git a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
index 51f40be4..0b3c067f 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
@@ -5,6 +5,7 @@
              xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
              x:Class="AideDeJeu.Views.ItemDetailPage"
              Title="{Binding Title}"
+             Icon="spell_book.png"
              x:Name="This">
     <ContentPage.Resources>
         <ResourceDictionary>
@@ -13,7 +14,7 @@
         </ResourceDictionary>
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star" Command="{Binding Main.Navigator.AddToFavoritesCommand}" />
+        <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" />
         <!--<ToolbarItem Name="DeepSearch" Text="Rechercher..." Order="Primary" Icon="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" />
         <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />-->
     </ContentPage.ToolbarItems>
diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
index 172ff14b..1dda05f9 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
@@ -16,7 +16,7 @@
         </ResourceDictionary>
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star" Command="{Binding Main.Navigator.AddToFavoritesCommand}" />
+        <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" />
         <!--<ToolbarItem Name="DeepSearch" Text="Rechercher..." Order="Primary" Icon="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" />
         <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />-->
     </ContentPage.ToolbarItems>
diff --git a/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml b/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
index d0cc61a3..584570f9 100644
--- a/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<NavigationPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="AideDeJeu.Views.MainNavigationPage">
+<NavigationPage 
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="AideDeJeu.Views.MainNavigationPage"
+    BackgroundColor="{StaticResource bgtan}"
+    BarBackgroundColor="{StaticResource rulered}"
+    BarTextColor="{StaticResource bgtan}">
 
 </NavigationPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml
index 38fae1d8..d2593188 100644
--- a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml
@@ -3,9 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             xmlns:views="clr-namespace:AideDeJeu.Views"
             x:Class="AideDeJeu.Views.MainTabbedPage"
-            Padding="0">
+            Padding="0"
+            BackgroundColor="{StaticResource bgtan}"
+            BarBackgroundColor="{StaticResource rulered}"
+            BarTextColor="{StaticResource bgtan}"
+            xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core"
+            windows:TabbedPage.HeaderIconsEnabled="true">
   <!--Pages can be added as references or inline-->
-    <views:MainNavigationPage x:Name="NavigationPage" Icon="spell_book">
+    <views:MainNavigationPage x:Name="NavigationPage" Icon="spell_book.png">
         <views:MainNavigationPage.Title>
             <OnPlatform x:TypeArguments="x:String" Android="" Default="Bibliothèque" WinPhone="Bibliothèque"/>
         </views:MainNavigationPage.Title>
@@ -13,7 +18,7 @@
             <views:ItemDetailPage />
         </x:Arguments>
     </views:MainNavigationPage>
-    <views:MainNavigationPage Icon="stars_stack">
+    <views:MainNavigationPage Icon="stars_stack.png">
         <views:MainNavigationPage.Title>
             <OnPlatform x:TypeArguments="x:String" Android="" Default="Favoris" WinPhone="Favoris"/>
         </views:MainNavigationPage.Title>
@@ -21,7 +26,7 @@
             <views:BookmarksPage />
         </x:Arguments>
     </views:MainNavigationPage>
-    <views:MainNavigationPage Icon="crystal_ball">
+    <views:MainNavigationPage Icon="crystal_ball.png">
         <views:MainNavigationPage.Title>
             <OnPlatform x:TypeArguments="x:String" Android="" Default="Recherche" WinPhone="Recherche"/>
         </views:MainNavigationPage.Title>
@@ -29,17 +34,7 @@
             <views:DeepSearchPage />
         </x:Arguments>
     </views:MainNavigationPage>
-    <!--<views:BookmarksPage Icon="stars_stack">
-        <views:BookmarksPage.Title>
-            <OnPlatform x:TypeArguments="x:String" Android="" Default="Favoris" WinPhone="Favoris"/>
-        </views:BookmarksPage.Title>
-    </views:BookmarksPage>
-    <views:DeepSearchPage Icon="crystal_ball">
-        <views:DeepSearchPage.Title>
-            <OnPlatform x:TypeArguments="x:String" Android="" Default="Recherche" WinPhone="Recherche" />
-        </views:DeepSearchPage.Title>
-    </views:DeepSearchPage>-->
-    <views:AboutPage Title="?" Icon="wooden_sign">
+    <views:AboutPage Title="?" Icon="wooden_sign.png">
         <views:AboutPage.Title>
             <OnPlatform x:TypeArguments="x:String" Android="" Default="À propos de..." WinPhone="À propos de..." />
         </views:AboutPage.Title>