diff --git a/AppShell.xaml b/AppShell.xaml
index 148ee2a..4d02187 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -13,6 +13,7 @@
             Title="Login Page"
             ContentTemplate="{DataTemplate views:LoginPage}"
             Route="Login" />
+        
         <ShellContent
             Title="changePassword"
             ContentTemplate="{DataTemplate views:changePassword}"
diff --git a/Views/changePassword.xaml b/Views/changePassword.xaml
index 5428c83..2bd8893 100644
--- a/Views/changePassword.xaml
+++ b/Views/changePassword.xaml
@@ -40,52 +40,83 @@
                 RowDefinitions="Auto, *, Auto, *,Auto,*">
                 <Label 
                     Grid.Row="0"
-                    Text="Old Password"
+                    Text="Old Password Here :"
                     FontFamily="PoppinsBold"
                     TextColor="{StaticResource TextColorSecondary}"/>
 
                 <Border
-                    Grid.Row="1"
-                    Style="{StaticResource SecondaryBorder}">
-                    <Entry
-                        Style="{StaticResource UserInput}"
-                        IsPassword="True"   
-                        Placeholder="Type your old password here"/>
+                    Style="{StaticResource SecondaryBorder}"
+                    Margin="0,30,10,20">
+                    <Grid
+                        Padding="5"
+                        BackgroundColor="{StaticResource BackgroundSecondary}"
+                        ColumnDefinitions="Auto,Auto,*">
+
+                        <Image 
+                            Grid.Column="1"
+                            Source="password_icon.svg">
+                        </Image>
+                        <Entry 
+                            Style="{StaticResource UserInput}"
+                            Grid.Column="2"
+                            Placeholder="Old Password"/>
+                    </Grid>
                 </Border>
 
                 <Label 
-                    Grid.Row="2"
-                    Text="New password"
+                    Grid.Row="0"
+                    Text="New Password Here :"
                     FontFamily="PoppinsBold"
                     TextColor="{StaticResource TextColorSecondary}"/>
 
                 <Border
-                    Grid.Row="3"
-                    Style="{StaticResource SecondaryBorder}">
-                    <Entry
-                        Style="{StaticResource UserInput}"
-                        IsPassword="True"
-                        Placeholder="Type your new password here"/>
+                    Style="{StaticResource SecondaryBorder}"
+                    Margin="0,30,0,20">
+                    <Grid
+                        Padding="5"
+                        BackgroundColor="{StaticResource BackgroundSecondary}"
+                        ColumnDefinitions="Auto,Auto,*">
+
+                        <Image 
+                            Grid.Column="1"
+                            Source="password_icon.svg">
+                        </Image>
+                        <Entry 
+                            Style="{StaticResource UserInput}"
+                            Grid.Column="2"
+                            Placeholder="Old Password"/>
+                    </Grid>
                 </Border>
 
                 <Label 
-                    Grid.Row="4"
-                    Text="Confirm the new password"
+                    Grid.Row="0"
+                    Text="Confirm New Password Here :"
                     FontFamily="PoppinsBold"
                     Margin="0,0,0,0"
                     TextColor="{StaticResource TextColorSecondary}"/>
-
+                
                 <Border
-                    Grid.Row="5"
-                    Style="{StaticResource SecondaryBorder}">
-                    <Entry
-                        Style="{StaticResource UserInput}"
-                        IsPassword="True"
-                        Placeholder="Type your new password here"/>
+                    Style="{StaticResource SecondaryBorder}"
+                    Margin="0,30,0,20">
+                    <Grid
+                        Padding="5"
+                        BackgroundColor="{StaticResource BackgroundSecondary}"
+                        ColumnDefinitions="Auto,Auto,*">
+
+                        <Image 
+                            Grid.Column="1"
+                            Source="password_icon.svg">
+                        </Image>
+                        <Entry 
+                            Style="{StaticResource UserInput}"
+                            Grid.Column="2"
+                            Placeholder="Old Password"/>
+                    </Grid>
                 </Border>
 
 
 
+
             </Grid>