diff --git a/src/Features/Gallery/Pages/BuiltIn/AppSettingsJson/Pages/AppSettingsJsonControlInfo.cs b/src/Features/Gallery/Pages/BuiltIn/AppSettingsJson/Pages/AppSettingsJsonControlInfo.cs
index 24fce20a..de2ce924 100644
--- a/src/Features/Gallery/Pages/BuiltIn/AppSettingsJson/Pages/AppSettingsJsonControlInfo.cs
+++ b/src/Features/Gallery/Pages/BuiltIn/AppSettingsJson/Pages/AppSettingsJsonControlInfo.cs
@@ -9,7 +9,7 @@ class AppSettingsJsonControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_braces_24_regular
     };
     public string ControlDetail => "Use appsettings.json inside your application thanks to MauiAppBuilder, we can use the ConfigurationManager that is built into configure settings in our .NET MAUI app";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/BuiltIn/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/BuiltIn/AppSettingsJson";
     public string DocumentUrl => $"https://montemagno.com/dotnet-maui-appsettings-json-configuration/";
     public string GroupName => ControlGroupInfo.BuiltInControls;
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/BuiltIn/Popup/PopupControlInfo.cs b/src/Features/Gallery/Pages/BuiltIn/Popup/PopupControlInfo.cs
index 6ca6d15d..638a64c6 100644
--- a/src/Features/Gallery/Pages/BuiltIn/Popup/PopupControlInfo.cs
+++ b/src/Features/Gallery/Pages/BuiltIn/Popup/PopupControlInfo.cs
@@ -1,5 +1,5 @@
 namespace MAUIsland.Gallery.BuiltIn;
-class PopupControlInfo : IControlInfo 
+class PopupControlInfo : IControlInfo
 {
     public string ControlName => "Pop up";
     public string ControlRoute => typeof(PopupPage).FullName;
@@ -9,7 +9,7 @@ class PopupControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_square_shadow_12_regular
     };
     public string ControlDetail => "Displaying an alert, asking a user to make a choice, or displaying a prompt is a common UI task. .NET Multi-platform App UI (.NET MAUI) has three methods on the Page class for interacting with the user via a pop-up: DisplayAlert, DisplayActionSheet, and DisplayPromptAsync. Pop-ups are rendered with native controls on each platform.";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/BuiltIn/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/BuiltIn/Popup";
     public string DocumentUrl => $"https://learn.microsoft.com/en-us/dotnet/maui/user-interface/pop-ups?view=net-maui-7.0";
     public string GroupName => ControlGroupInfo.BuiltInControls;
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/Material/MaterialButton/MaterialButtonControlInfo.cs b/src/Features/Gallery/Pages/Material/MaterialButton/MaterialButtonControlInfo.cs
index 016025a1..d6918cd9 100644
--- a/src/Features/Gallery/Pages/Material/MaterialButton/MaterialButtonControlInfo.cs
+++ b/src/Features/Gallery/Pages/Material/MaterialButton/MaterialButtonControlInfo.cs
@@ -9,7 +9,7 @@ class MaterialButtonControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_add_circle_24_regular
     };
     public string ControlDetail => "Buttons allow users to take actions, and make choices, with a single tap.";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/MaterialButton";
     public string DocumentUrl => $"https://mdc-maui.github.io/button";
     public string GroupName => ControlGroupInfo.MaterialComponent;
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/Material/MaterialChip/MaterialChipControlInfo.cs b/src/Features/Gallery/Pages/Material/MaterialChip/MaterialChipControlInfo.cs
index 1f76e466..7a3ca100 100644
--- a/src/Features/Gallery/Pages/Material/MaterialChip/MaterialChipControlInfo.cs
+++ b/src/Features/Gallery/Pages/Material/MaterialChip/MaterialChipControlInfo.cs
@@ -11,7 +11,7 @@ class MaterialChipControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_oval_24_regular
     };
     public string ControlDetail => "Chips are compact elements that represent an input, attribute, or action.";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/MaterialChip";
     public string DocumentUrl => $"https://mdc-maui.github.io/chip";
     public string GroupName => ControlGroupInfo.MaterialComponent;
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/Material/MaterialChip/MaterialChipPage.xaml b/src/Features/Gallery/Pages/Material/MaterialChip/MaterialChipPage.xaml
index ca4e6aef..cca293bf 100644
--- a/src/Features/Gallery/Pages/Material/MaterialChip/MaterialChipPage.xaml
+++ b/src/Features/Gallery/Pages/Material/MaterialChip/MaterialChipPage.xaml
@@ -13,7 +13,7 @@
         <ToolbarItem
             Command="{x:Binding OpenUrlCommand}"
             CommandParameter="{x:Binding ControlInformation.GitHubUrl}"
-            IconImageSource="github.png"
+            IconImageSource="githublogo.png"
             Text="Source code" />
         <ToolbarItem
             Command="{x:Binding OpenUrlCommand}"
diff --git a/src/Features/Gallery/Pages/Material/MaterialComboBox/MaterialComboBoxControlInfo.cs b/src/Features/Gallery/Pages/Material/MaterialComboBox/MaterialComboBoxControlInfo.cs
index a7036863..6fff4112 100644
--- a/src/Features/Gallery/Pages/Material/MaterialComboBox/MaterialComboBoxControlInfo.cs
+++ b/src/Features/Gallery/Pages/Material/MaterialComboBox/MaterialComboBoxControlInfo.cs
@@ -11,7 +11,7 @@ class MaterialComboBoxControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_caret_down_24_regular
     };
     public string ControlDetail => "ComboBox displays a short list of items, from which the user can select an item.";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/MaterialComboBox";
     public string DocumentUrl => $"https://mdc-maui.github.io/combo-box";
     public string GroupName => ControlGroupInfo.MaterialComponent;
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuControlInfo.cs b/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuControlInfo.cs
index ff4e6641..178c084c 100644
--- a/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuControlInfo.cs
+++ b/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuControlInfo.cs
@@ -11,7 +11,7 @@ class MaterialContextMenuControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_list_24_regular
     };
     public string ControlDetail => "ContextMenu display a list of choices on a temporary surface, It can be included in the component that has the touch event.";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/MaterialContextMenu";
     public string DocumentUrl => $"https://mdc-maui.github.io/context-menu";
     public string GroupName => ControlGroupInfo.MaterialComponent;
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuPage.xaml b/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuPage.xaml
index 9ba11813..39270d7f 100644
--- a/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuPage.xaml
+++ b/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuPage.xaml
@@ -13,7 +13,7 @@
         <ToolbarItem
             Command="{x:Binding OpenUrlCommand}"
             CommandParameter="{x:Binding ControlInformation.GitHubUrl}"
-            IconImageSource="github.png"
+            IconImageSource="githublogo.png"
             Text="Source code" />
         <ToolbarItem
             Command="{x:Binding OpenUrlCommand}"
diff --git a/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuPageViewModel.cs b/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuPageViewModel.cs
index 8d0f7692..07a57740 100644
--- a/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuPageViewModel.cs
+++ b/src/Features/Gallery/Pages/Material/MaterialContextMenu/MaterialContextMenuPageViewModel.cs
@@ -26,4 +26,10 @@ protected override void OnInit(IDictionary<string, object> query)
 
     }
     #endregion
+
+    #region [ Relay Commands ]
+    [RelayCommand]
+    Task OpenUrlAsync(string url)
+    => AppNavigator.OpenUrlAsync(url);
+    #endregion
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/Material/MaterialFAB/MaterialFABControlInfo.cs b/src/Features/Gallery/Pages/Material/MaterialFAB/MaterialFABControlInfo.cs
index a6f3098d..bccce913 100644
--- a/src/Features/Gallery/Pages/Material/MaterialFAB/MaterialFABControlInfo.cs
+++ b/src/Features/Gallery/Pages/Material/MaterialFAB/MaterialFABControlInfo.cs
@@ -11,7 +11,7 @@ class MaterialFABControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_add_square_24_regular
     };
     public string ControlDetail => "FABs(floating action button) represents the primary action of a screen.";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/MaterialFAB";
     public string DocumentUrl => $"https://mdc-maui.github.io/FAB";
     public string GroupName => ControlGroupInfo.MaterialComponent;
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/Material/MaterialFAB/MaterialFABPage.xaml b/src/Features/Gallery/Pages/Material/MaterialFAB/MaterialFABPage.xaml
index 30c62290..7f6eff86 100644
--- a/src/Features/Gallery/Pages/Material/MaterialFAB/MaterialFABPage.xaml
+++ b/src/Features/Gallery/Pages/Material/MaterialFAB/MaterialFABPage.xaml
@@ -13,7 +13,7 @@
         <ToolbarItem
             Command="{x:Binding OpenUrlCommand}"
             CommandParameter="{x:Binding ControlInformation.GitHubUrl}"
-            IconImageSource="github.png"
+            IconImageSource="githublogo.png"
             Text="Source code" />
         <ToolbarItem
             Command="{x:Binding OpenUrlCommand}"
diff --git a/src/Features/Gallery/Pages/Material/MaterialNavigationDrawer/MaterialNavigationDrawerControlInfo.cs b/src/Features/Gallery/Pages/Material/MaterialNavigationDrawer/MaterialNavigationDrawerControlInfo.cs
index 45463b2b..c2f4cd57 100644
--- a/src/Features/Gallery/Pages/Material/MaterialNavigationDrawer/MaterialNavigationDrawerControlInfo.cs
+++ b/src/Features/Gallery/Pages/Material/MaterialNavigationDrawer/MaterialNavigationDrawerControlInfo.cs
@@ -11,7 +11,7 @@ class MaterialNavigationDrawerControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_navigation_24_regular
     };
     public string ControlDetail => "Navigation drawers provide ergonomic access to destinations in an app.";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/MaterialNavigationDrawer";
     public string DocumentUrl => $"https://mdc-maui.github.io/navigation-drawer";
     public string GroupName => ControlGroupInfo.MaterialComponent;
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/Material/MaterialSwitch/MaterialSwitchControlInfo.cs b/src/Features/Gallery/Pages/Material/MaterialSwitch/MaterialSwitchControlInfo.cs
index f19fe006..e1f2f6f8 100644
--- a/src/Features/Gallery/Pages/Material/MaterialSwitch/MaterialSwitchControlInfo.cs
+++ b/src/Features/Gallery/Pages/Material/MaterialSwitch/MaterialSwitchControlInfo.cs
@@ -9,7 +9,7 @@ class MaterialSwitchControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_toggle_left_24_regular
     };
     public string ControlDetail => "Switches toggle the state of a single setting on or off.";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/MaterialSwitch";
     public string DocumentUrl => $"https://mdc-maui.github.io/switch";
     public string GroupName => ControlGroupInfo.MaterialComponent;
 }
\ No newline at end of file
diff --git a/src/Features/Gallery/Pages/Material/MaterialSwitch/MaterialSwitchPage.xaml b/src/Features/Gallery/Pages/Material/MaterialSwitch/MaterialSwitchPage.xaml
index 52bb612c..3b1d4930 100644
--- a/src/Features/Gallery/Pages/Material/MaterialSwitch/MaterialSwitchPage.xaml
+++ b/src/Features/Gallery/Pages/Material/MaterialSwitch/MaterialSwitchPage.xaml
@@ -13,7 +13,7 @@
         <ToolbarItem
             Command="{x:Binding OpenUrlCommand}"
             CommandParameter="{x:Binding ControlInformation.GitHubUrl}"
-            IconImageSource="github.png"
+            IconImageSource="githublogo.png"
             Text="Source code" />
         <ToolbarItem
             Command="{x:Binding OpenUrlCommand}"
diff --git a/src/Features/Gallery/Pages/Material/MaterialTextField/MaterialTextFieldControlInfo.cs b/src/Features/Gallery/Pages/Material/MaterialTextField/MaterialTextFieldControlInfo.cs
index 373e6449..d06627de 100644
--- a/src/Features/Gallery/Pages/Material/MaterialTextField/MaterialTextFieldControlInfo.cs
+++ b/src/Features/Gallery/Pages/Material/MaterialTextField/MaterialTextFieldControlInfo.cs
@@ -11,7 +11,7 @@ class MaterialTextFieldControlInfo : IControlInfo
         Glyph = FluentUIIcon.Ic_fluent_text_field_24_regular
     };
     public string ControlDetail => "Text fields allow users to enter text into a UI.";
-    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/{ControlName}";
+    public string GitHubUrl => $"https://github.com/Strypper/mauisland/tree/main/src/Features/Gallery/Pages/Material/MaterialTextField";
     public string DocumentUrl => $"https://mdc-maui.github.io/text-field";
     public string GroupName => ControlGroupInfo.MaterialComponent;
 }
\ No newline at end of file
diff --git a/src/MAUIsland.csproj b/src/MAUIsland.csproj
index ad7de3c5..28cbdab9 100644
--- a/src/MAUIsland.csproj
+++ b/src/MAUIsland.csproj
@@ -86,6 +86,8 @@
 	  <None Remove="Resources\Images\logos\materialuibanner.png" />
 	  <None Remove="Resources\Images\logos\materialuilogo.png" />
 	  <None Remove="Resources\Images\logos\syncfusionlogo.png" />
+	  <None Remove="Resources\Images\logos\tizenlogo.svg" />
+	  <None Remove="Resources\Images\logos\windowslogo.svg" />
 	  <None Remove="Resources\Images\mauibeach.jpeg" />
 	  <None Remove="Resources\Images\mauilogo.png" />
 	  <None Remove="Resources\Images\mauitoolkitbanner.png" />
@@ -468,6 +470,8 @@
     <MauiImage Include="Resources\Images\logos\materialuilogo.png" />
     <MauiImage Include="Resources\Images\logos\mauilogo.png" />
     <MauiImage Include="Resources\Images\logos\syncfusionlogo.png" />
+    <MauiImage Include="Resources\Images\logos\tizenlogo.svg" />
+    <MauiImage Include="Resources\Images\logos\windowslogo.svg" />
     <MauiImage Include="Resources\Images\memes\mrincredibleblackwhite.png" />
     <MauiImage Include="Resources\Images\memes\mrincredibleblackwhite1.png" />
     <MauiImage Include="Resources\Images\memes\mrincredibleblackwhite2.png" />