diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 32132b9..3531da1 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,103 +1,148 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true">
+    android:background="@color/background_color">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <!-- Header / Top Bar area -->
+    <View
+        android:id="@+id/header_bg"
         android:layout_width="match_parent"
+        android:layout_height="160dp"
+        android:background="@color/primary_color"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/image_profile_home"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="48dp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_placeholder"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerSize50Percent" 
+        app:strokeWidth="2dp"
+        app:strokeColor="@color/white" />
+
+    <TextView
+        android:id="@+id/text_greeting"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:padding="16dp">
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="24dp"
+        android:text="Olá, utilizador!"
+        android:textColor="@color/white"
+        android:textSize="26sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/image_profile_home"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/image_profile_home"
+        app:layout_constraintTop_toTopOf="@id/image_profile_home" />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/image_profile_home"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:src="@drawable/ic_placeholder"
-            android:scaleType="centerCrop"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerSize50Percent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="24dp"
+        android:fillViewport="true"
+        android:clipToPadding="false"
+        android:paddingBottom="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/image_profile_home">
 
-        <TextView
-            android:id="@+id/text_greeting"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:text="Olá, utilizador!"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            android:textColor="@color/primary_color"
-            app:layout_constraintTop_toTopOf="@id/image_profile_home"
-            app:layout_constraintBottom_toBottomOf="@id/image_profile_home"
-            app:layout_constraintStart_toEndOf="@id/image_profile_home"/>
-
-        <!-- Agenda de Consultas -->
-        <TextView
-            android:id="@+id/title_agenda"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:text="Agenda de Consultas"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            android:textColor="@color/primary_color"
-            app:layout_constraintTop_toBottomOf="@id/image_profile_home"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_appointments"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:nestedScrollingEnabled="false"
-            app:layout_constraintTop_toBottomOf="@id/title_agenda"
-            app:layout_constraintStart_toStartOf="parent"/>
+            android:orientation="vertical"
+            android:paddingHorizontal="20dp">
 
-        <TextView
-            android:id="@+id/text_empty_appointments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Sem consultas agendadas."
-            android:textAlignment="center"
-            android:textColor="@android:color/darker_gray"
-            android:layout_marginTop="8dp"
-            android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@id/recycler_appointments" />
+            <!-- Agenda de Consultas -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="16dp"
+                android:gravity="center_vertical">
+                
+                <ImageView
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:src="@android:drawable/ic_menu_my_calendar"
+                    app:tint="@color/primary_color"/>
 
-        <!-- Tratamentos Atuais -->
-        <TextView
-            android:id="@+id/title_medication"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:text="Tratamentos Atuais"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            android:textColor="@color/primary_color"
-            app:layout_constraintTop_toBottomOf="@id/recycler_appointments"
-            app:layout_constraintStart_toStartOf="parent" />
+                <TextView
+                    android:id="@+id/title_agenda"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:text="Agenda de Consultas"
+                    android:textColor="@color/text_primary"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_medications"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:nestedScrollingEnabled="false"
-            app:layout_constraintTop_toBottomOf="@id/title_medication"
-            app:layout_constraintStart_toStartOf="parent"/>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_appointments"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:nestedScrollingEnabled="false" />
 
-        <TextView
-            android:id="@+id/text_empty_medications"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Nenhum tratamento ativo."
-            android:textAlignment="center"
-            android:textColor="@android:color/darker_gray"
-            android:layout_marginTop="8dp"
-            android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@id/recycler_medications" />
+            <TextView
+                android:id="@+id/text_empty_appointments"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="Sem consultas agendadas."
+                android:textAlignment="center"
+                android:textColor="@color/text_secondary"
+                android:visibility="gone" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.core.widget.NestedScrollView>
+            <!-- Tratamentos Atuais -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="40dp"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:src="@android:drawable/ic_menu_agenda"
+                    app:tint="@color/primary_color"/>
+
+                <TextView
+                    android:id="@+id/title_medication"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:text="Tratamentos Atuais"
+                    android:textColor="@color/text_primary"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_medications"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:nestedScrollingEnabled="false" />
+
+            <TextView
+                android:id="@+id/text_empty_medications"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="Nenhum tratamento ativo."
+                android:textAlignment="center"
+                android:textColor="@color/text_secondary"
+                android:visibility="gone" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_appointment.xml b/app/src/main/res/layout/item_appointment.xml
index d18216e..18bf313 100644
--- a/app/src/main/res/layout/item_appointment.xml
+++ b/app/src/main/res/layout/item_appointment.xml
@@ -3,74 +3,114 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp"
+    android:layout_marginVertical="8dp"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
-    app:cardCornerRadius="16dp"
-    app:cardElevation="4dp">
+    app:cardCornerRadius="20dp"
+    app:cardElevation="2dp"
+    app:strokeWidth="0dp"
+    app:cardBackgroundColor="@color/surface_color">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="20dp">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <View
+            android:id="@+id/indicator"
+            android:layout_width="6dp"
+            android:layout_height="0dp"
+            android:background="@color/primary_color"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginEnd="12dp"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/text_type"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <TextView
-                android:id="@+id/text_type"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="Tipo de Consulta"
-                android:textStyle="bold"
-                android:textSize="18sp"
-                android:textColor="@color/primary_color"/>
-            
-            <TextView
-                android:id="@+id/text_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Pendente"
-                android:textStyle="bold"
-                android:textSize="14sp"
-                android:padding="4dp"
-                android:background="#FFE0B2"
-                android:textColor="#F57C00"
-                android:gravity="end"/>
-        </LinearLayout>
+            android:text="Tipo de Consulta"
+            android:textColor="@color/text_primary"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/text_status"
+            android:layout_marginEnd="8dp"/>
+
+        <TextView
+            android:id="@+id/text_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Pendente"
+            android:textColor="#F57C00"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            android:paddingHorizontal="10dp"
+            android:paddingVertical="4dp"
+            android:background="@drawable/bg_rounded_status"
+            app:layout_constraintTop_toTopOf="@id/text_type"
+            app:layout_constraintBottom_toBottomOf="@id/text_type"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:id="@+id/time_layout"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_marginTop="8dp">
+            android:layout_marginTop="12dp"
+            android:gravity="center_vertical"
+            app:layout_constraintTop_toBottomOf="@id/text_type"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@android:drawable/ic_menu_today"
+                app:tint="@color/primary_color"
+                android:layout_marginEnd="4dp"/>
 
             <TextView
                 android:id="@+id/text_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="dd/MM/yyyy"
-                android:layout_marginEnd="16dp"/>
+                android:textColor="@color/text_primary"
+                android:textSize="15sp"
+                android:textStyle="bold"/>
+
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@android:drawable/ic_menu_recent_history"
+                app:tint="@color/primary_color"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="4dp"/>
 
             <TextView
                 android:id="@+id/text_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="HH:mm"
-                android:textStyle="italic"/>
+                android:textColor="@color/text_primary"
+                android:textSize="15sp"
+                android:textStyle="bold"/>
         </LinearLayout>
 
         <TextView
             android:id="@+id/text_reason"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="Motivo: --"
             android:textSize="14sp"
             android:textColor="@color/text_secondary"
-            android:layout_marginTop="8dp"/>
-    </LinearLayout>
+            android:layout_marginTop="12dp"
+            app:layout_constraintTop_toBottomOf="@id/time_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_medication.xml b/app/src/main/res/layout/item_medication.xml
index d27aaa6..a1f8d4b 100644
--- a/app/src/main/res/layout/item_medication.xml
+++ b/app/src/main/res/layout/item_medication.xml
@@ -3,74 +3,112 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp"
+    android:layout_marginVertical="8dp"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
-    app:cardCornerRadius="16dp"
-    app:cardElevation="4dp">
+    app:cardCornerRadius="20dp"
+    app:cardElevation="2dp"
+    app:strokeWidth="0dp"
+    app:cardBackgroundColor="@color/surface_color">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="16dp"
-        android:gravity="center_vertical">
+        android:padding="20dp">
 
-        <ImageView
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:src="@android:drawable/ic_menu_agenda"
-            app:tint="@color/secondary_color"
-            android:layout_marginEnd="16dp"/>
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/icon_bg"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            app:cardCornerRadius="16dp"
+            app:cardElevation="0dp"
+            app:strokeWidth="0dp"
+            app:cardBackgroundColor="#E3F2FD"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+            
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="center"
+                android:src="@android:drawable/ic_menu_agenda"
+                app:tint="@color/primary_color"/>
+        </com.google.android.material.card.MaterialCardView>
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/text_med_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_weight="1">
+            android:text="Nome Medicamento"
+            android:textColor="@color/text_primary"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:layout_marginStart="16dp"
+            app:layout_constraintTop_toTopOf="@id/icon_bg"
+            app:layout_constraintStart_toEndOf="@id/icon_bg"
+            app:layout_constraintEnd_toStartOf="@id/checkbox_taken"
+            android:layout_marginEnd="8dp"/>
 
-            <TextView
-                android:id="@+id/text_med_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Nome Medicamento"
-                android:textStyle="bold"
-                android:textSize="18sp"
-                android:textColor="@color/primary_color"/>
+        <TextView
+            android:id="@+id/text_med_dosage"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="Dosagem"
+            android:textColor="@color/text_secondary"
+            android:textSize="14sp"
+            android:layout_marginTop="4dp"
+            app:layout_constraintTop_toBottomOf="@id/text_med_name"
+            app:layout_constraintStart_toStartOf="@id/text_med_name"
+            app:layout_constraintEnd_toEndOf="@id/text_med_name"/>
 
-            <TextView
-                android:id="@+id/text_med_dosage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Dosagem"
-                android:layout_marginTop="4dp"/>
-                
-            <TextView
-                android:id="@+id/text_med_notes"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Observações"
-                android:textStyle="italic"
-                android:textSize="12sp"
-                android:layout_marginTop="2dp"/>
+        <TextView
+            android:id="@+id/text_med_notes"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="Observações"
+            android:textColor="@color/primary_color"
+            android:textStyle="italic"
+            android:textSize="13sp"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@id/text_med_dosage"
+            app:layout_constraintStart_toStartOf="@id/text_med_name"
+            app:layout_constraintEnd_toEndOf="@id/text_med_name"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="12dp"
+            android:gravity="center_vertical"
+            app:layout_constraintTop_toBottomOf="@id/text_med_notes"
+            app:layout_constraintStart_toStartOf="@id/text_med_name">
+
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@android:drawable/ic_menu_recent_history"
+                app:tint="@color/primary_color"
+                android:layout_marginEnd="4dp"/>
 
             <TextView
                 android:id="@+id/text_med_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="HH:mm"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                android:textColor="@color/black"
-                android:layout_marginTop="6dp"/>
+                android:textColor="@color/text_primary"
+                android:textSize="15sp"
+                android:textStyle="bold"/>
         </LinearLayout>
 
         <CheckBox
             android:id="@+id/checkbox_taken"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:buttonTint="@color/primary_color"/>
+            android:buttonTint="@color/primary_color"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>