diff --git a/res/layout/fragment_list_view.xml b/res/layout/fragment_list_view.xml
--- a/res/layout/fragment_list_view.xml
+++ b/res/layout/fragment_list_view.xml
@@ -3,44 +3,46 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
-                
 
-        <TextView
-            android:id="@+id/messageTextView"
+        <android.support.v7.widget.CardView
+            android:id="@+id/favorites_cardView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="307dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="10dp"
-            android:layout_toStartOf="@+id/addToFavorites"
-            android:layout_toLeftOf="@+id/addToFavorites"
-            android:gravity="center_vertical"
-            android:minHeight="48dp"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            fab:cardElevation="2dp"
+            fab:cardCornerRadius="5dp"
+            android:layout_margin="16dp">
 
-        <ImageButton
-            android:id="@+id/addToFavorites"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/resultsListView"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginBottom="16dp"
-            android:background="@android:color/transparent"
-            fab:srcCompat="@drawable/ic_star_outline" />
+                <TextView
+                    android:id="@+id/messageTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toLeftOf="@+id/addToFavorites"
+                    android:gravity="center_vertical"
+                    android:layout_marginLeft="4dp"
+                    android:minHeight="48dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_toStartOf="@+id/addToFavorites"
+                    android:layout_marginStart="4dp"
+                    android:foreground="?attr/selectableItemBackground" />
+
+                <ImageButton
+                    android:id="@+id/addToFavorites"
+                    android:layout_width="45dp"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="end"
+                    android:background="@android:color/transparent"
+                    fab:srcCompat="@drawable/ic_star_outline"
+                    tools:ignore="OnClick"
+                    android:foreground="?attr/selectableItemBackground" />
+
+        </android.support.v7.widget.CardView>
 
         <ListView
-                android:layout_below="@id/messageTextView"
-                android:id="@+id/resultsListView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clickable="true"
-                android:descendantFocusability="blocksDescendants"
-                android:visibility="visible"
-        />
-        </RelativeLayout>
\ No newline at end of file
+            android:id="@+id/resultsListView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/favorites_cardView"
+            android:clickable="true"
+            android:descendantFocusability="blocksDescendants"
+            android:visibility="visible" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -35,7 +35,7 @@
     <string name="dialog_rename_bus_stop_username_title">Rinomina fermata</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about">Informazioni</string>
-    <string name="howDoesItWork"><b>Tocca il nome della fermata</b> per aggiungerla ai preferiti\n\n<b>Come leggere gli orari:</b>\n<b>&#160;&#160;&#160;12:56*</b> Orario in tempo reale\n<b>&#160;&#160;&#160;12:56</b> &#160; Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario.</string>
+    <string name="howDoesItWork"><b>Tocca la stella</b> per aggiungerla ai preferiti\n\n<b>Come leggere gli orari:</b>\n<b>&#160;&#160;&#160;12:56*</b> Orario in tempo reale\n<b>&#160;&#160;&#160;12:56</b> &#160; Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario.</string>
     <string name="hint_button">OK !</string>
     <string name="about_history">
 <![CDATA[
diff --git a/res/values/strings.xml b/res/values/strings.xml
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -42,7 +42,7 @@
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about">About</string>
     <string name="howDoesItWork">
-        <b>Tap the bus stop name</b>
+        <b>Tap the star</b>
         to add it to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
         arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
     </string>
diff --git a/src/it/reyboz/bustorino/fragments/ResultListFragment.java b/src/it/reyboz/bustorino/fragments/ResultListFragment.java
--- a/src/it/reyboz/bustorino/fragments/ResultListFragment.java
+++ b/src/it/reyboz/bustorino/fragments/ResultListFragment.java
@@ -302,7 +302,6 @@
                         mListener.toggleLastStopToFavorites();
                     }
                 });
-                break;
             case STOPS:
                 addToFavorites.setClickable(false);
                 break;