diff --git a/app/src/main/res/drawable/bus_stop_new.xml b/app/src/main/res/drawable/bus_stop_new.xml
index 1fc8451..cfbb96a 100644
--- a/app/src/main/res/drawable/bus_stop_new.xml
+++ b/app/src/main/res/drawable/bus_stop_new.xml
@@ -1,21 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
+    android:width="28dp"
+    android:height="28dp"
     android:viewportWidth="7.4083"
     android:viewportHeight="7.4087">
   <path
       android:pathData="M0.9452,0L6.4632,0A0.9452,0.9452 0,0 1,7.4083 0.9452L7.4083,6.4635A0.9452,0.9452 0,0 1,6.4632 7.4087L0.9452,7.4087A0.9452,0.9452 0,0 1,0 6.4635L0,0.9452A0.9452,0.9452 0,0 1,0.9452 0z"
       android:strokeLineJoin="round"
       android:strokeWidth="0.0936408"
       android:fillColor="@color/red_orange"
       android:strokeColor="#00000000"/>
   <path
       android:pathData="m3.5412,1.164c-0.732,0 -1.2681,0.085 -1.6077,0.2548 -0.3395,0.1698 -0.509,0.4376 -0.509,0.8036v2.5135c0,0.1279 0.0238,0.2459 0.0723,0.354 0.0485,0.108 0.1129,0.2064 0.1922,0.2946v0.5421c0,0.075 0.0253,0.1379 0.076,0.1886 0.0507,0.0507 0.1137,0.076 0.1886,0.076h0.2646c0.075,0 0.1374,-0.0253 0.1881,-0.076 0.0507,-0.0507 0.0765,-0.1136 0.0765,-0.1886L2.4829,5.662L3.7474,5.662L3.642,5.5565C3.5147,5.4293 3.4139,5.2859 3.3391,5.1328L2.4829,5.1328c-0.1455,0 -0.2705,-0.0519 -0.3741,-0.1555 -0.1036,-0.1036 -0.155,-0.2281 -0.155,-0.3736v-0.7937h1.3565c0.0768,-0.1767 0.1873,-0.3423 0.3318,-0.4868 0.0145,-0.0145 0.0295,-0.0285 0.0444,-0.0424h-0.1452,-1.5875v-0.7937h3.175v0.4175c0.1863,0.0447 0.366,0.124 0.5292,0.2372v-0.9193c0,-0.3792 -0.1636,-0.6502 -0.4899,-0.8134C4.8417,1.2458 4.2997,1.164 3.5412,1.164ZM3.5541,1.6932c0.4851,0 0.837,0.0253 1.0552,0.076 0.2183,0.0507 0.3602,0.1137 0.4263,0.1886L2.0726,1.9578c0.0794,-0.0662 0.2282,-0.1268 0.4465,-0.1819 0.2183,-0.0551 0.5632,-0.0827 1.0351,-0.0827zM2.6152,4.0745c-0.1102,0 -0.2039,0.0386 -0.2811,0.1158 -0.0772,0.0772 -0.1158,0.1709 -0.1158,0.2811 0,0.1102 0.0386,0.2039 0.1158,0.2811 0.0772,0.0772 0.1709,0.1158 0.2811,0.1158 0.1102,0 0.2039,-0.0386 0.2811,-0.1158 0.0772,-0.0772 0.1158,-0.1709 0.1158,-0.2811 0,-0.1102 -0.0386,-0.204 -0.1158,-0.2811 -0.0772,-0.0772 -0.1709,-0.1158 -0.2811,-0.1158z"
       android:strokeWidth="0.00661458"
       android:fillColor="?colorOnPrimary"/>
   <path
       android:pathData="m4.7541,3.2766c-0.3147,0 -0.6292,0.1199 -0.8693,0.3599 -0.4802,0.4802 -0.4802,1.2587 0,1.7389l0.8693,0.8693 0.8696,-0.8693c0.4801,-0.4802 0.4801,-1.2587 0,-1.7389 -0.2401,-0.2401 -0.5549,-0.3599 -0.8696,-0.3599zM4.7541,3.9596c0.3018,0 0.5464,0.2447 0.5464,0.5464 0,0.3018 -0.2447,0.5464 -0.5464,0.5464 -0.3018,0 -0.5464,-0.2447 -0.5464,-0.5464 0,-0.3018 0.2447,-0.5464 0.5464,-0.5464z"
       android:strokeWidth="0.136612"
       android:fillColor="?colorOnPrimary"
       android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/bus_stop_new_highlight.xml b/app/src/main/res/drawable/bus_stop_new_highlight.xml
index c4f081b..2761475 100644
--- a/app/src/main/res/drawable/bus_stop_new_highlight.xml
+++ b/app/src/main/res/drawable/bus_stop_new_highlight.xml
@@ -1,21 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
+    android:width="28dp"
+    android:height="28dp"
     android:viewportWidth="7.4083"
     android:viewportHeight="7.4087">
   <path
       android:pathData="M0.9452,0L6.4632,0A0.9452,0.9452 0,0 1,7.4083 0.9452L7.4083,6.4635A0.9452,0.9452 0,0 1,6.4632 7.4087L0.9452,7.4087A0.9452,0.9452 0,0 1,0 6.4635L0,0.9452A0.9452,0.9452 0,0 1,0.9452 0z"
       android:strokeLineJoin="round"
       android:strokeWidth="0.0936408"
-      android:fillColor="@color/blue_620"
+      android:fillColor="@color/light_blue_900"
       android:strokeColor="#00000000"/>
   <path
       android:pathData="m3.5412,1.164c-0.732,0 -1.2681,0.085 -1.6077,0.2548 -0.3395,0.1698 -0.509,0.4376 -0.509,0.8036v2.5135c0,0.1279 0.0238,0.2459 0.0723,0.354 0.0485,0.108 0.1129,0.2064 0.1922,0.2946v0.5421c0,0.075 0.0253,0.1379 0.076,0.1886 0.0507,0.0507 0.1137,0.076 0.1886,0.076h0.2646c0.075,0 0.1374,-0.0253 0.1881,-0.076 0.0507,-0.0507 0.0765,-0.1136 0.0765,-0.1886L2.4829,5.662L3.7474,5.662L3.642,5.5565C3.5147,5.4293 3.4139,5.2859 3.3391,5.1328L2.4829,5.1328c-0.1455,0 -0.2705,-0.0519 -0.3741,-0.1555 -0.1036,-0.1036 -0.155,-0.2281 -0.155,-0.3736v-0.7937h1.3565c0.0768,-0.1767 0.1873,-0.3423 0.3318,-0.4868 0.0145,-0.0145 0.0295,-0.0285 0.0444,-0.0424h-0.1452,-1.5875v-0.7937h3.175v0.4175c0.1863,0.0447 0.366,0.124 0.5292,0.2372v-0.9193c0,-0.3792 -0.1636,-0.6502 -0.4899,-0.8134C4.8417,1.2458 4.2997,1.164 3.5412,1.164ZM3.5541,1.6932c0.4851,0 0.837,0.0253 1.0552,0.076 0.2183,0.0507 0.3602,0.1137 0.4263,0.1886L2.0726,1.9578c0.0794,-0.0662 0.2282,-0.1268 0.4465,-0.1819 0.2183,-0.0551 0.5632,-0.0827 1.0351,-0.0827zM2.6152,4.0745c-0.1102,0 -0.2039,0.0386 -0.2811,0.1158 -0.0772,0.0772 -0.1158,0.1709 -0.1158,0.2811 0,0.1102 0.0386,0.2039 0.1158,0.2811 0.0772,0.0772 0.1709,0.1158 0.2811,0.1158 0.1102,0 0.2039,-0.0386 0.2811,-0.1158 0.0772,-0.0772 0.1158,-0.1709 0.1158,-0.2811 0,-0.1102 -0.0386,-0.204 -0.1158,-0.2811 -0.0772,-0.0772 -0.1709,-0.1158 -0.2811,-0.1158z"
       android:strokeWidth="0.00661458"
       android:fillColor="?colorOnPrimary"/>
   <path
       android:pathData="m4.7541,3.2766c-0.3147,0 -0.6292,0.1199 -0.8693,0.3599 -0.4802,0.4802 -0.4802,1.2587 0,1.7389l0.8693,0.8693 0.8696,-0.8693c0.4801,-0.4802 0.4801,-1.2587 0,-1.7389 -0.2401,-0.2401 -0.5549,-0.3599 -0.8696,-0.3599zM4.7541,3.9596c0.3018,0 0.5464,0.2447 0.5464,0.5464 0,0.3018 -0.2447,0.5464 -0.5464,0.5464 -0.3018,0 -0.5464,-0.2447 -0.5464,-0.5464 0,-0.3018 0.2447,-0.5464 0.5464,-0.5464z"
       android:strokeWidth="0.136612"
       android:fillColor="?colorOnPrimary"
       android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_map_libre.xml b/app/src/main/res/layout/fragment_map_libre.xml
index d35d69e..a0c9e16 100644
--- a/app/src/main/res/layout/fragment_map_libre.xml
+++ b/app/src/main/res/layout/fragment_map_libre.xml
@@ -1,195 +1,193 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:theme="@style/MapTheme"
     tools:context=".fragments.MapLibreFragment">
 
     <org.maplibre.android.maps.MapView
             android:id="@+id/libreMapView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
     />
 
     <!-- Bottom Sheet for details -->
     <RelativeLayout
         android:id="@+id/bottom_sheet"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
         android:orientation="vertical"
         android:background="@drawable/bottom_sheet_background"
         android:elevation="8dp"
         android:padding="13dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
         app:behavior_hideable="true"
         app:behavior_peekHeight="4dp"
         android:clickable="true"
         android:focusable="true">
 
         <TextView
                 android:id="@+id/stopNumberTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="18sp"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentStart="true"
                 android:layout_toStartOf="@id/arrivalsCardButton"
                 android:layout_marginTop="8dp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
                 android:layout_marginBottom="2dp"
                 android:fontFamily="@font/pitagon_semibold"
 
         />
         <TextView
             android:id="@+id/stopTitleTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
             android:textStyle="bold"
             android:layout_below="@id/stopNumberTextView"
             android:layout_alignParentStart="true"
             android:layout_toStartOf="@id/arrivalsCardButton"
             android:layout_marginBottom="5dp"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:fontFamily="@font/pitagon_regular"
         />
         <TextView
                 android:id="@+id/linesPassingTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="14sp"
                 android:layout_below="@id/stopTitleTextView"
                 android:layout_alignParentStart="true"
                 android:layout_toStartOf="@id/arrivalsCardButton"
                 android:layout_marginBottom="5dp"
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
         />
         <androidx.cardview.widget.CardView
                 android:id="@+id/arrivalsCardButton"
                 android:layout_width="50sp"
                 android:layout_height="50sp"
                 android:layout_margin="5sp"
                 app:cardCornerRadius="25sp"
-                app:cardElevation="5dp"
+                app:cardElevation="2dp"
                 android:clickable="true"
                 android:focusable="true"
                 android:layout_alignParentTop="true"
                 android:layout_toStartOf="@id/directionsCardButton"
                 android:backgroundTint="?android:attr/colorPrimary"
                 android:foreground="?selectableItemBackground">
 
             <ImageView
                     android:layout_width="30sp"
                     android:layout_height="30sp"
                     android:layout_gravity="center"
                     android:tint="?colorOnPrimary"
                     app:srcCompat="@drawable/ic_baseline_departure_board_24" />
 
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
                 android:id="@+id/directionsCardButton"
                 android:layout_width="50sp"
                 android:layout_height="50sp"
                 android:layout_margin="5sp"
                 app:cardCornerRadius="25sp"
-                app:cardElevation="5dp"
+                app:cardElevation="2dp"
                 android:clickable="true"
                 android:focusable="true"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true"
                 android:foreground="?selectableItemBackground"
                 android:backgroundTint="?android:attr/colorPrimary">
 
             <ImageView
                     android:layout_width="30sp"
                     android:layout_height="30sp"
                     android:layout_gravity="center"
                     app:srcCompat="@drawable/navigation_right" />
 
         </androidx.cardview.widget.CardView>
 
 
         <!-- Additional details -->
 
         <!-- Close button -->
         <ImageView
             android:layout_width="30sp"
             android:layout_height="30sp"
             app:srcCompat="@drawable/baseline_close_16"
             android:id="@+id/btnClose"
             android:layout_marginTop="15dp"
             android:layout_marginEnd="15dp"
             android:layout_marginBottom="5dp"
             android:layout_marginStart="10dp"
             android:layout_below="@id/directionsCardButton"
-            android:background="@drawable/ball"
-            android:tint="?colorOnPrimary"
             android:layout_alignParentEnd="true"
             app:layout_constraintHorizontal_bias="0.5"
             android:foreground="?selectableItemBackground"
             />
     </RelativeLayout>
 
     <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:pointerIcon="none">
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginTop="60dp"
             android:layout_marginEnd="6dp"
 
            >
 
             <ImageButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/locationEnableIcon"
                     android:src="@drawable/location_circlew_grey"
 
                     android:background="#00ffffff"
                     android:contentDescription="@string/enable_position"
                     android:layout_alignParentTop="true"
                     android:layout_alignParentEnd="true"
                     android:layout_marginEnd="4dp"
 
                     android:cropToPadding="true"/>
             <ImageButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/centerMapImageButton"
                     android:src="@drawable/ic_center_map"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
                     android:layout_below="@id/locationEnableIcon"
                     android:layout_marginTop="6dp"
                     android:background="#00ffffff"
                     android:contentDescription="@string/bt_center_map_description"
                     android:cropToPadding="true" />
 
             <ImageButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/followUserImageButton"
                     android:src="@drawable/ic_follow_me"
                     android:background="#00ffffff"
                     android:contentDescription="@string/bt_follow_me_description"
                     android:cropToPadding="true"
                     android:layout_below="@+id/centerMapImageButton"
                     android:layout_alignStart="@+id/centerMapImageButton"
                     android:layout_marginTop="6dp" />
 
     </RelativeLayout>
     </FrameLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file