diff --git a/app/build.gradle b/app/build.gradle
index 6171590a..777af2d6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 31
-        versionName "2.0.1"
+        versionName "2.1.0"
         archivesBaseName = "mTHMMY-v$versionName"
         buildConfigField "String", "CURRENT_BRANCH", "\"" + getCurrentBranch() + "\""
         buildConfigField "String", "COMMIT_HASH", "\"" + getCommitHash() + "\""
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarksActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarksActivity.java
index 7fbdf746..6ce16ec0 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarksActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarksActivity.java
@@ -89,7 +89,9 @@ public class BookmarksActivity extends BaseActivity {
                 startActivity(intent);
                 break;
             case BookmarksFragment.INTERACTION_TOGGLE_TOPIC_NOTIFICATION:
-                return toggleNotification(bookmarkedTopic);
+                boolean notificationsEnabled = toggleNotification(bookmarkedTopic);
+                displayNotificationsToggleToast(notificationsEnabled);
+                return notificationsEnabled;
             case BookmarksFragment.INTERACTION_REMOVE_TOPIC_BOOKMARK:
                 removeBookmark(bookmarkedTopic);
                 Toast.makeText(BaseApplication.getInstance().getApplicationContext(), "Bookmark removed", Toast.LENGTH_SHORT).show();
@@ -112,7 +114,9 @@ public class BookmarksActivity extends BaseActivity {
                 startActivity(intent);
                 break;
             case BookmarksFragment.INTERACTION_TOGGLE_BOARD_NOTIFICATION:
-                return toggleNotification(bookmarkedBoard);
+                boolean notificationsEnabled = toggleNotification(bookmarkedBoard);
+                displayNotificationsToggleToast(notificationsEnabled);
+                return notificationsEnabled;
             case BookmarksFragment.INTERACTION_REMOVE_BOARD_BOOKMARK:
                 removeBookmark(bookmarkedBoard);
                 Toast.makeText(getApplicationContext(), "Bookmark removed", Toast.LENGTH_SHORT).show();
@@ -123,6 +127,11 @@ public class BookmarksActivity extends BaseActivity {
         return true;
     }
 
+    private void displayNotificationsToggleToast (boolean notificationsEnabled){
+        String toastText = notificationsEnabled ? "Notifications enabled" : "Notifications disabled";
+        Toast.makeText(BaseApplication.getInstance().getApplicationContext(), toastText, Toast.LENGTH_SHORT).show();
+    }
+
     /**
      * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
      * one of the sections/tabs/pages. If it becomes too memory intensive,
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarksFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarksFragment.java
index 3b634550..3c2713d1 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarksFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BookmarksFragment.java
@@ -106,7 +106,7 @@ public class BookmarksFragment extends Fragment {
                 if (bookmark != null && bookmark.getTitle() != null) {
                     final LinearLayout row = (LinearLayout) layoutInflater.inflate(
                             R.layout.fragment_bookmarks_row, bookmarksLinearView, false);
-                    row.setOnClickListener(view -> {
+                    row.findViewById(R.id.bookmark_card).setOnClickListener(view -> {
                         Activity activity = getActivity();
                         if (activity instanceof BookmarksActivity)
                             ((BookmarksActivity) activity).onFragmentRowInteractionListener(type, interactionClick, bookmark);
diff --git a/app/src/main/res/drawable/ic_notification_off.xml b/app/src/main/res/drawable/ic_notification_off.xml
index 1efd1289..f91fda60 100644
--- a/app/src/main/res/drawable/ic_notification_off.xml
+++ b/app/src/main/res/drawable/ic_notification_off.xml
@@ -1,5 +1,9 @@
-<vector android:height="24dp" android:tint="#26A69A"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,18.69L7.84,6.14 5.27,3.49 4,4.76l2.8,2.8v0.01c-0.52,0.99 -0.8,2.16 -0.8,3.42v5l-2,2v1h13.73l2,2L21,19.72l-1,-1.03zM12,22c1.11,0 2,-0.89 2,-2h-4c0,1.11 0.89,2 2,2zM18,14.68L18,11c0,-3.08 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.15,0.03 -0.29,0.08 -0.42,0.12 -0.1,0.03 -0.2,0.07 -0.3,0.11h-0.01c-0.01,0 -0.01,0 -0.02,0.01 -0.23,0.09 -0.46,0.2 -0.68,0.31 0,0 -0.01,0 -0.01,0.01L18,14.68z"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zM16,17L8,17v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml
index e672fab8..280a9cc4 100644
--- a/app/src/main/res/layout/fragment_bookmarks.xml
+++ b/app/src/main/res/layout/fragment_bookmarks.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="top|start"
-        android:background="@color/primary_lighter"
+        android:background="@color/primary_lighter_2"
         android:scrollbars="none"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
@@ -17,10 +17,8 @@
             android:id="@+id/bookmarks_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:showDividers="middle"
-            android:divider="?android:listDivider"
-            android:dividerPadding="16dp" />
+            android:layout_margin="2dp"
+            android:orientation="vertical" />
     </androidx.core.widget.NestedScrollView>
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_bookmarks_row.xml b/app/src/main/res/layout/fragment_bookmarks_row.xml
index eafe5ef1..09367bcd 100644
--- a/app/src/main/res/layout/fragment_bookmarks_row.xml
+++ b/app/src/main/res/layout/fragment_bookmarks_row.xml
@@ -1,49 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/bookmark_row"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/bookmark_title"
-        android:layout_width="0dp"
+    <androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/bookmark_card"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingBottom="8dp"
-        android:paddingTop="6dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="0dp"
-        android:textColor="@color/primary_text"
-        android:textSize="18sp" />
+        android:foreground="?android:attr/selectableItemBackground"
+        card_view:cardBackgroundColor="@color/background"
+        card_view:cardCornerRadius="5dp"
+        card_view:cardElevation="2dp"
+        card_view:cardPreventCornerOverlap="false"
+        card_view:cardUseCompatPadding="true"
+        android:clickable="true"
+        android:focusable="true">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
-    <ImageButton
-        android:id="@+id/toggle_notification"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingBottom="3dp"
-        android:paddingTop="3dp"
-        android:paddingStart="6dp"
-        android:paddingEnd="6dp"
-        android:background="@android:color/transparent"
-        android:contentDescription="@string/toggle_notification"
-        app:srcCompat="@drawable/ic_notification_on" />
+            <TextView
+                android:id="@+id/bookmark_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingBottom="8dp"
+                android:paddingTop="6dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="0dp"
+                android:textColor="@color/primary_text"
+                android:textSize="18sp" />
 
-    <ImageButton
-        android:id="@+id/remove_bookmark"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingBottom="3dp"
-        android:paddingTop="3dp"
-        android:paddingStart="6dp"
-        android:paddingEnd="6dp"
-        android:layout_marginEnd="12dp"
-        android:background="@android:color/transparent"
-        android:contentDescription="@string/remove_bookmark"
-        app:srcCompat="@drawable/ic_delete_accent_24dp" />
+            <ImageButton
+                android:id="@+id/toggle_notification"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingBottom="3dp"
+                android:paddingTop="3dp"
+                android:paddingStart="6dp"
+                android:paddingEnd="6dp"
+                android:background="@android:color/transparent"
+                android:contentDescription="@string/toggle_notification"
+                app:srcCompat="@drawable/ic_notification_on" />
+
+            <ImageButton
+                android:id="@+id/remove_bookmark"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingBottom="3dp"
+                android:paddingTop="3dp"
+                android:paddingStart="6dp"
+                android:paddingEnd="12dp"
+                android:background="@android:color/transparent"
+                android:contentDescription="@string/remove_bookmark"
+                app:srcCompat="@drawable/ic_delete_accent_24dp" />
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file