diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java
index 3f93ddc4..6b7dee26 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/BoardBookmarksFragment.java
@@ -73,7 +73,7 @@ public class BoardBookmarksFragment extends Fragment {
             for (final Bookmark bookmarkedBoard : boardBookmarks) {
                 if (bookmarkedBoard != null && bookmarkedBoard.getTitle() != null) {
                     final LinearLayout row = (LinearLayout) layoutInflater.inflate(
-                            R.layout.activity_bookmark_board_row, bookmarksLinearView, false);
+                            R.layout.fragment_bookmarks_board_row, bookmarksLinearView, false);
                     row.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java
index d2b982f0..7679ad2f 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/bookmarks/TopicBookmarksFragment.java
@@ -87,7 +87,7 @@ public class TopicBookmarksFragment extends Fragment {
             for (final Bookmark bookmarkedTopic : topicBookmarks) {
                 if (bookmarkedTopic != null && bookmarkedTopic.getTitle() != null) {
                     final LinearLayout row = (LinearLayout) layoutInflater.inflate(
-                            R.layout.activity_bookmark_topic_row, bookmarksLinearView, false);
+                            R.layout.fragment_bookmarks_topic_row, bookmarksLinearView, false);
                     row.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
diff --git a/app/src/main/res/drawable-hdpi/ic_delete.png b/app/src/main/res/drawable-hdpi/ic_delete.png
new file mode 100644
index 00000000..83e1bb27
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_delete.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_remove_circle.png b/app/src/main/res/drawable-hdpi/ic_remove_circle.png
deleted file mode 100644
index e4cc8579..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_remove_circle.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete.png b/app/src/main/res/drawable-mdpi/ic_delete.png
new file mode 100644
index 00000000..5ac9ef30
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_delete.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_remove_circle.png b/app/src/main/res/drawable-mdpi/ic_remove_circle.png
deleted file mode 100644
index a8470e61..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_remove_circle.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete.png b/app/src/main/res/drawable-xhdpi/ic_delete.png
new file mode 100644
index 00000000..36f26ac7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_delete.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_remove_circle.png b/app/src/main/res/drawable-xhdpi/ic_remove_circle.png
deleted file mode 100644
index c8ef34d2..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_remove_circle.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete.png b/app/src/main/res/drawable-xxhdpi/ic_delete.png
new file mode 100644
index 00000000..4d806633
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_delete.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_remove_circle.png b/app/src/main/res/drawable-xxhdpi/ic_remove_circle.png
deleted file mode 100644
index 505d8b3a..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_remove_circle.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete.png b/app/src/main/res/drawable-xxxhdpi/ic_delete.png
new file mode 100644
index 00000000..3ececbea
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_delete.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_remove_circle.png b/app/src/main/res/drawable-xxxhdpi/ic_remove_circle.png
deleted file mode 100644
index 5bfad8b3..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_remove_circle.png and /dev/null differ
diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml
index 43f171d7..cd5ec7af 100644
--- a/app/src/main/res/layout/fragment_bookmarks.xml
+++ b/app/src/main/res/layout/fragment_bookmarks.xml
@@ -17,6 +17,9 @@
             android:id="@+id/bookmarks_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"/>
+            android:orientation="vertical"
+            android:showDividers="middle"
+            android:divider="?android:listDivider"
+            android:dividerPadding="16dp"/>
     </android.support.v4.widget.NestedScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bookmark_board_row.xml b/app/src/main/res/layout/fragment_bookmarks_board_row.xml
similarity index 65%
rename from app/src/main/res/layout/activity_bookmark_board_row.xml
rename to app/src/main/res/layout/fragment_bookmarks_board_row.xml
index 7d2632a2..a29222b0 100644
--- a/app/src/main/res/layout/activity_bookmark_board_row.xml
+++ b/app/src/main/res/layout/fragment_bookmarks_board_row.xml
@@ -8,26 +8,30 @@
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingBottom="6dp"
-    android:paddingEnd="16dp"
-    android:paddingStart="16dp"
-    android:paddingTop="6dp">
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/bookmark_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="2dp"
+        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="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:attr/selectableItemBackground"
         android:contentDescription="@string/remove_bookmark"
-        android:src="@drawable/ic_remove_circle"/>
+        android:src="@drawable/ic_delete"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bookmark_topic_row.xml b/app/src/main/res/layout/fragment_bookmarks_topic_row.xml
similarity index 66%
rename from app/src/main/res/layout/activity_bookmark_topic_row.xml
rename to app/src/main/res/layout/fragment_bookmarks_topic_row.xml
index 09158cb6..60b23b81 100644
--- a/app/src/main/res/layout/activity_bookmark_topic_row.xml
+++ b/app/src/main/res/layout/fragment_bookmarks_topic_row.xml
@@ -9,26 +9,29 @@
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingBottom="6dp"
-    android:paddingEnd="16dp"
-    android:paddingStart="16dp"
-    android:paddingTop="6dp">
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/bookmark_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="2dp"
+        android:paddingBottom="8dp"
+        android:paddingTop="6dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="0dp"
         android:textColor="@color/primary_text"
         android:textSize="18sp"/>
 
     <ImageButton
         android:id="@+id/toggle_notification"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
+        android:layout_height="match_parent"
+        android:paddingBottom="3dp"
+        android:paddingTop="3dp"
+        android:paddingStart="6dp"
+        android:paddingEnd="6dp"
+        android:layout_marginEnd="9dp"
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/toggle_notification"
         app:srcCompat="@drawable/ic_notification_on"/>
@@ -36,8 +39,13 @@
     <ImageButton
         android:id="@+id/remove_bookmark"
         android:layout_width="wrap_content"
-        android:layout_height="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:attr/selectableItemBackground"
         android:contentDescription="@string/remove_bookmark"
-        android:src="@drawable/ic_remove_circle"/>
+        android:src="@drawable/ic_delete"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f95c254d..df0d3cd4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,7 +100,4 @@
     <string name="cancel">Cancel</string>
     <string name="open">Open</string>
     <string name="download">Download</string>
-
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>