diff --git a/Sources/Stim/ConfirmationPopup.xaml b/Sources/Stim/ConfirmationPopup.xaml
index 7b9c8c5..e8b43b4 100644
--- a/Sources/Stim/ConfirmationPopup.xaml
+++ b/Sources/Stim/ConfirmationPopup.xaml
@@ -4,8 +4,8 @@
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="Stim.ConfirmationPopup"
                CanBeDismissedByTappingOutsideOfPopup="False">
-    
-    <Grid RowDefinitions="*, *" ColumnDefinitions="*, *">
+
+    <Grid RowDefinitions="auto, *" ColumnDefinitions="*, *" Style="{StaticResource popupGrid}">
         <Label Grid.ColumnSpan="2" x:Name="placeholder" Style="{StaticResource popupLabel}"/>
         <Button Grid.Row="2" Style="{StaticResource popupButton}" Text="Non" Clicked="No"/>
         <Button Grid.Row="2" Grid.Column="2" Style="{StaticResource popupButton}" Text="Oui" Clicked="Yes"/>
diff --git a/Sources/Stim/EntryPopup.xaml b/Sources/Stim/EntryPopup.xaml
index dacf7d9..11b0a18 100644
--- a/Sources/Stim/EntryPopup.xaml
+++ b/Sources/Stim/EntryPopup.xaml
@@ -4,12 +4,12 @@
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="Stim.EntryPopup"
              CanBeDismissedByTappingOutsideOfPopup="False">
-    
-        <Grid ColumnDefinitions="*" RowDefinitions="*, *, *, *">
-            <Label x:Name="placeholder" Style="{StaticResource popupLabel}"/>
-            <Entry Grid.Row="1" x:Name="Entrytxt" VerticalOptions="Center" HorizontalOptions="Center"/>
-            <Button Grid.Row="2" Text="Valider" Style="{StaticResource popupButton}" Clicked="Valider"/>
-            <Button Grid.Row="3" Text="Annuler" Style="{StaticResource popupButton}" Clicked="CloseButton"/>
+
+    <Grid ColumnDefinitions="*" RowDefinitions="auto, auto, *, *" Style="{StaticResource popupGrid}">
+        <Label x:Name="placeholder" Style="{StaticResource popupLabel}"/>
+        <Entry Grid.Row="1" x:Name="Entrytxt" Style="{StaticResource popupEntry}"/>
+        <Button Grid.Row="2" Text="Valider" Style="{StaticResource popupButton}" Clicked="Valider"/>
+        <Button Grid.Row="3" Text="Annuler" Style="{StaticResource popupButton}" Clicked="CloseButton"/>
         <HorizontalStackLayout x:Name="Error"/>
     </Grid>
 </toolkit:Popup>
diff --git a/Sources/Stim/MessagePopup.xaml b/Sources/Stim/MessagePopup.xaml
index 4681669..bea4c05 100644
--- a/Sources/Stim/MessagePopup.xaml
+++ b/Sources/Stim/MessagePopup.xaml
@@ -5,7 +5,7 @@
              x:Class="Stim.MessagePopup"
              CanBeDismissedByTappingOutsideOfPopup ="False">
 
-    <Grid RowDefinitions="*, *" ColumnDefinitions="*">
+    <Grid RowDefinitions="auto, *" ColumnDefinitions="*" Style="{StaticResource popupGrid}">
         <Label x:Name="placeholder" Style="{StaticResource popupLabel}"/>
         <Button Grid.Row="1" Text="Fermer" Style="{StaticResource popupButton}" Clicked="CloseButton"/>
     </Grid>
diff --git a/Sources/Stim/Resources/Styles/Styles.xaml b/Sources/Stim/Resources/Styles/Styles.xaml
index e49b846..ddcd3d3 100644
--- a/Sources/Stim/Resources/Styles/Styles.xaml
+++ b/Sources/Stim/Resources/Styles/Styles.xaml
@@ -394,6 +394,23 @@
         <Setter Property="VerticalOptions" Value="Center"/>
     </Style>
 
+    <Style TargetType="Button" x:Key="popupButton">
+        <Setter Property="FontSize" Value="30"/>
+        <Setter Property="BorderColor" Value="{StaticResource Secondary}"/>
+        <Setter Property="BorderWidth" Value="2"/>
+        <Setter Property="HorizontalOptions" Value="Center"/>
+        <Setter Property="VerticalOptions" Value="Center" />
+        <Setter Property="Background" Value="{StaticResource Transparent}"/>
+    </Style>
+
+    <Style TargetType="Grid" x:Key="popupGrid">
+        <Setter Property="Background" Value="{StaticResource Tertiary}"/>
+    </Style>
+    
+    <Style TargetType="Entry" x:Key="popupEntry">
+        <Setter Property="VerticalOptions" Value="Center"/>
+    </Style>
+
     <Style TargetType="Button" x:Key="followButton">
         <Setter Property="Text" Value="Suivre"/>
         <Setter Property="Background" Value="{StaticResource Transparent}"/>
@@ -405,15 +422,6 @@
         <Setter Property="Margin" Value="10"/>
     </Style>
 
-    <Style TargetType="Button" x:Key="popupButton">
-        <Setter Property="FontSize" Value="30"/>
-        <Setter Property="BorderColor" Value="{StaticResource Secondary}"/>
-        <Setter Property="BorderWidth" Value="2"/>
-        <Setter Property="HorizontalOptions" Value="Center"/>
-        <Setter Property="VerticalOptions" Value="Center" />
-        <Setter Property="Background" Value="{StaticResource Transparent}"/>
-    </Style>
-
     <Style TargetType="ImageButton" x:Key="addButton">
         <Setter Property="Source" Value="add_white.png"/>
         <Setter Property="Background" Value="{StaticResource Transparent}"/>