diff --git a/app/src/main/java/de/baumann/browser/view/TwoPaneLayout.kt b/app/src/main/java/de/baumann/browser/view/TwoPaneLayout.kt
index cb1a2d769..ce49d54a1 100644
--- a/app/src/main/java/de/baumann/browser/view/TwoPaneLayout.kt
+++ b/app/src/main/java/de/baumann/browser/view/TwoPaneLayout.kt
@@ -33,7 +33,7 @@ class TwoPaneLayout : FrameLayout {
     private val binding: TwoPaneLayoutBinding = TwoPaneLayoutBinding.inflate(LayoutInflater.from(context), this)
     private val separator: View = binding.separator
     private val floatingLine: View = binding.floatingLine
-    private val dragHandle: View = binding.dragHandle
+    private val dragHandle: View = binding.middleDragHandle
 
     private var panel1: View? = null
     private var panel2: View? = null
diff --git a/app/src/main/java/de/baumann/browser/view/adapter/BookmarkAdapter.kt b/app/src/main/java/de/baumann/browser/view/adapter/BookmarkAdapter.kt
index 2a653076e..2ba935aca 100644
--- a/app/src/main/java/de/baumann/browser/view/adapter/BookmarkAdapter.kt
+++ b/app/src/main/java/de/baumann/browser/view/adapter/BookmarkAdapter.kt
@@ -1,6 +1,5 @@
 package de.baumann.browser.view.adapter
 
-import android.graphics.Bitmap
 import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
@@ -13,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView
 import de.baumann.browser.Ninja.R
 import de.baumann.browser.database.Bookmark
 import de.baumann.browser.database.BookmarkManager
-import kotlinx.coroutines.*
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
diff --git a/app/src/main/java/de/baumann/browser/view/dialog/BookmarkEditDialog.kt b/app/src/main/java/de/baumann/browser/view/dialog/BookmarkEditDialog.kt
index 18c17ab99..74966089d 100644
--- a/app/src/main/java/de/baumann/browser/view/dialog/BookmarkEditDialog.kt
+++ b/app/src/main/java/de/baumann/browser/view/dialog/BookmarkEditDialog.kt
@@ -16,6 +16,7 @@ import de.baumann.browser.database.Bookmark
 import de.baumann.browser.database.BookmarkManager
 import de.baumann.browser.view.NinjaToast
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
 
 class BookmarkEditDialog(
         private val activity: Activity,
@@ -24,6 +25,8 @@ class BookmarkEditDialog(
         private val okAction: () -> Unit,
         private val cancelAction: () -> Unit,
 ) {
+    private val dialogManager: DialogManager = DialogManager(activity)
+
     fun show() {
         val lifecycleScope = (activity as LifecycleOwner).lifecycleScope
 
@@ -49,7 +52,7 @@ class BookmarkEditDialog(
 
     private fun addFolder(lifecycleScope: LifecycleCoroutineScope, binding: DialogEditBookmarkBinding) {
         lifecycleScope.launch {
-            val folderName = getFolderName()
+            val folderName = dialogManager.getBookmarkFolderName() ?: return@launch
             bookmarkManager.insertDirectory(folderName)
             updateFolderSpinner(binding, folderName)
         }
@@ -92,15 +95,4 @@ class BookmarkEditDialog(
             NinjaToast.show(activity, de.baumann.browser.Ninja.R.string.toast_error)
         }
     }
-
-    private suspend fun getFolderName(): String {
-        val context: Context = activity
-        return TextInputDialog(
-                context,
-                context.getString(de.baumann.browser.Ninja.R.string.folder_name),
-                context.getString(de.baumann.browser.Ninja.R.string.folder_name_description),
-                ""
-        ).show() ?: "New Folder"
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/baumann/browser/view/dialog/BookmarkListDialog.kt b/app/src/main/java/de/baumann/browser/view/dialog/BookmarkListDialog.kt
index ef451622c..fef289c41 100644
--- a/app/src/main/java/de/baumann/browser/view/dialog/BookmarkListDialog.kt
+++ b/app/src/main/java/de/baumann/browser/view/dialog/BookmarkListDialog.kt
@@ -2,6 +2,7 @@ package de.baumann.browser.view.dialog
 
 import android.app.Activity
 import android.app.AlertDialog
+import android.app.Dialog
 import android.content.Context
 import android.graphics.Point
 import android.view.Gravity
@@ -19,7 +20,6 @@ import de.baumann.browser.Ninja.databinding.DialogMenuContextListBinding
 import de.baumann.browser.database.Bookmark
 import de.baumann.browser.database.BookmarkManager
 import de.baumann.browser.preference.ConfigManager
-import de.baumann.browser.unit.HelperUnit
 import de.baumann.browser.unit.ViewUnit
 import de.baumann.browser.view.NinjaToast
 import de.baumann.browser.view.adapter.BookmarkAdapter
@@ -96,18 +96,9 @@ class BookmarkListDialog(
         }
     }
 
-    private suspend fun getFolderName(): String? {
-        return TextInputDialog(
-                context,
-                context.getString(R.string.folder_name),
-                context.getString(R.string.folder_name_description),
-                ""
-        ).show()
-    }
-
     private fun createBookmarkFolder() {
         lifecycleScope.launch {
-            val folderName = getFolderName()
+            val folderName = dialogManager.getBookmarkFolderName()
             folderName?.let { bookmarkManager.insertDirectory(it) }
         }
     }
@@ -174,61 +165,48 @@ class BookmarkListDialog(
 
     private fun showBookmarkContextMenu(bookmark: Bookmark) {
         val dialogView = DialogMenuContextListBinding.inflate(LayoutInflater.from(context))
-        val dialog = dialogManager.showOptionDialog(dialogView.root)
+        val optionDialog = dialogManager.showOptionDialog(dialogView.root)
 
         if (bookmark.isDirectory) {
-            dialogView.menuContextListFav.visibility = View.GONE
-            dialogView.menuContextLinkSc.visibility = View.GONE
             dialogView.menuContextListNewTab.visibility = View.GONE
             dialogView.menuContextListNewTabOpen.visibility = View.GONE
-            dialogView.menuContextListFav.visibility = View.GONE
             dialogView.menuContextListSplitScreen.visibility = View.GONE
         }
 
         dialogView.menuContextListSplitScreen.setOnClickListener {
-            dialog.dismissWithAction {
-                splitScreenAction(bookmark.url)
-                dialog.dismiss()
-            }
+            optionDialog.dismissWithAction { splitScreenAction(bookmark.url) }
         }
 
-        dialogView.menuContextListEdit.visibility = View.VISIBLE
-        dialogView.menuContextListFav.setOnClickListener {
-            dialog.dismissWithAction { config.favoriteUrl = bookmark.url }
-        }
-        dialogView.menuContextLinkSc.setOnClickListener {
-            dialog.dismissWithAction { HelperUnit.createShortcut(context, bookmark.title, bookmark.url, null) }
-        }
+        dialogView.menuContextListEdit.visibility = VISIBLE
         dialogView.menuContextListNewTab.setOnClickListener {
-            dialog.dismissWithAction {
+            optionDialog.dismissWithAction {
                 addTabAction(context.getString(R.string.app_name), bookmark.url, false)
                 NinjaToast.show(context, context.getString(R.string.toast_new_tab_successful))
             }
         }
         dialogView.menuContextListNewTabOpen.setOnClickListener {
-            dialog.dismissWithAction {
-                addTabAction(bookmark.title, bookmark.url, true)
-                dialog.dismiss()
-            }
+            optionDialog.dismissWithAction { addTabAction(bookmark.title, bookmark.url, true) }
         }
         dialogView.menuContextListDelete.setOnClickListener {
-            dialog.dismissWithAction {
-                lifecycleScope.launch {
-                    bookmarkManager.delete(bookmark)
-                }
-            }
+            lifecycleScope.launch { bookmarkManager.delete(bookmark) }
+            optionDialog.dismiss()
         }
 
         dialogView.menuContextListEdit.setOnClickListener {
-            dialog.dismissWithAction {
-                BookmarkEditDialog(
-                        context as Activity,
-                        bookmarkManager,
-                        bookmark,
-                        { ViewUnit.hideKeyboard(context) },
-                        { ViewUnit.hideKeyboard(context) }
-                ).show()
-            }
+            BookmarkEditDialog(
+                    context as Activity,
+                    bookmarkManager,
+                    bookmark,
+                    { ViewUnit.hideKeyboard(context) },
+                    { ViewUnit.hideKeyboard(context) }
+            ).show()
+            optionDialog.dismiss()
         }
     }
+
+    private fun Dialog.dismissWithAction(action: () -> Unit) {
+        dismiss()
+        dialog.dismiss()
+        action()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/baumann/browser/view/dialog/DialogManager.kt b/app/src/main/java/de/baumann/browser/view/dialog/DialogManager.kt
index bfe4fa1c2..75052b947 100644
--- a/app/src/main/java/de/baumann/browser/view/dialog/DialogManager.kt
+++ b/app/src/main/java/de/baumann/browser/view/dialog/DialogManager.kt
@@ -195,6 +195,14 @@ class DialogManager(
         dialog.show()
         return dialog
     }
+
+    suspend fun getBookmarkFolderName(): String? =
+            TextInputDialog(
+                    activity,
+                    activity.getString(R.string.folder_name),
+                    activity.getString(R.string.folder_name_description),
+                    ""
+            ).show()
 }
 
 fun Dialog.dismissWithAction(action: () -> Unit) {
diff --git a/app/src/main/java/de/baumann/browser/view/dialog/ToolbarConfigDialog.kt b/app/src/main/java/de/baumann/browser/view/dialog/ToolbarConfigDialog.kt
index f7f5f9a8e..cf09fd237 100644
--- a/app/src/main/java/de/baumann/browser/view/dialog/ToolbarConfigDialog.kt
+++ b/app/src/main/java/de/baumann/browser/view/dialog/ToolbarConfigDialog.kt
@@ -75,7 +75,7 @@ class ToolbarConfigDialog(
         }
 
         val controller = DragSortController(listView).apply {
-            setDragHandleId(R.id.drag_handle)
+            setDragHandleId(R.id.middle_drag_handle)
             isRemoveEnabled = false
             isSortEnabled = true
             setBackgroundColor(0xFFFFFF)
diff --git a/app/src/main/java/de/baumann/browser/view/viewControllers/OverviewDialogController.kt b/app/src/main/java/de/baumann/browser/view/viewControllers/OverviewDialogController.kt
index c6295ab71..7241fa71f 100644
--- a/app/src/main/java/de/baumann/browser/view/viewControllers/OverviewDialogController.kt
+++ b/app/src/main/java/de/baumann/browser/view/viewControllers/OverviewDialogController.kt
@@ -272,12 +272,6 @@ class OverviewDialogController(
 
         with (dialogView) {
             menuContextListEdit.visibility = GONE
-            menuContextListFav.setOnClickListener {
-                dialog.dismissWithAction { config.favoriteUrl = url }
-            }
-            menuContextLinkSc.setOnClickListener {
-                dialog.dismissWithAction { HelperUnit.createShortcut(context, title, url, null) }
-            }
             menuContextListNewTab.setOnClickListener {
                 dialog.dismissWithAction {
                     addTabAction(context.getString(R.string.app_name), url, false)
diff --git a/app/src/main/res/drawable/check_green.xml b/app/src/main/res/drawable/check_green.xml
deleted file mode 100755
index f478fbf73..000000000
--- a/app/src/main/res/drawable/check_green.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/check.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#4caf50" android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_new_window.xml b/app/src/main/res/drawable/ic_new_window.xml
deleted file mode 100644
index bbc546cc4..000000000
--- a/app/src/main/res/drawable/ic_new_window.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM19,11h-4v4h-2v-4L9,11L9,9h4L13,5h2v4h4v2z"/>
-</vector>
diff --git a/app/src/main/res/layout/dialog_edit_title.xml b/app/src/main/res/layout/dialog_edit_title.xml
deleted file mode 100755
index cb744962f..000000000
--- a/app/src/main/res/layout/dialog_edit_title.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/colorBackground"
-    android:paddingEnd="20dp"
-    android:paddingStart="20dp"
-    android:paddingTop="15dp"
-    tools:ignore="Autofill">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <EditText
-            android:id="@+id/dialog_edit"
-            android:selectAllOnFocus="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:includeFontPadding="false"
-            android:imeOptions="actionDone"
-            android:inputType="text"
-            android:hint="@string/dialog_title_hint" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp">
-
-        <Button
-            android:id="@+id/action_ok"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:includeFontPadding="false"
-            android:background="?attr/selectableItemBackground"
-            android:textColor="?android:attr/colorAccent"
-            android:text="@android:string/ok"/>
-
-        <Button android:id="@+id/action_cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:includeFontPadding="false"
-            android:layout_toStartOf="@+id/action_ok"
-            android:background="?attr/selectableItemBackground"
-            android:textColor="?android:attr/colorAccent"
-            android:text="@android:string/cancel"/>
-
-    </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_menu_context_list.xml b/app/src/main/res/layout/dialog_menu_context_list.xml
index 6af66e1d1..5fe910441 100755
--- a/app/src/main/res/layout/dialog_menu_context_list.xml
+++ b/app/src/main/res/layout/dialog_menu_context_list.xml
@@ -137,65 +137,6 @@
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/menu_contextLink_sc"
-                android:layout_width="match_parent"
-                android:layout_height="46dp"
-                android:minHeight="46dp"
-                android:paddingEnd="8dp"
-                android:paddingStart="8dp"
-                android:background="@drawable/item_bg_selector"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginEnd="16dp"
-                    android:gravity="center_vertical"
-                    android:src="@drawable/link_plus" />
-
-                <TextView
-                    android:text="@string/menu_sc"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:includeFontPadding="false"
-                    android:ellipsize="end"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/menu_contextList_fav"
-                android:layout_width="match_parent"
-                android:layout_height="46dp"
-                android:minHeight="46dp"
-                android:paddingEnd="8dp"
-                android:paddingStart="8dp"
-                android:background="@drawable/item_bg_selector"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginEnd="16dp"
-                    android:gravity="center_vertical"
-                    android:src="@drawable/ic_home" />
-
-                <TextView
-                    android:text="@string/menu_fav"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:includeFontPadding="false"
-                    android:ellipsize="end"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/menu_contextList_delete"
diff --git a/app/src/main/res/layout/item_list_preference_multi_drag.xml b/app/src/main/res/layout/item_list_preference_multi_drag.xml
index c7e48073d..6126bc950 100644
--- a/app/src/main/res/layout/item_list_preference_multi_drag.xml
+++ b/app/src/main/res/layout/item_list_preference_multi_drag.xml
@@ -7,7 +7,7 @@
     android:gravity="center_vertical">
 
     <ImageView
-        android:id="@+id/drag_handle"
+        android:id="@+id/middle_drag_handle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="?attr/dragIcon"
diff --git a/app/src/main/res/layout/two_pane_layout.xml b/app/src/main/res/layout/two_pane_layout.xml
index d1dc52cd7..3cd3b2249 100644
--- a/app/src/main/res/layout/two_pane_layout.xml
+++ b/app/src/main/res/layout/two_pane_layout.xml
@@ -15,7 +15,7 @@
         android:visibility="gone"
         android:background="?attr/colorControlNormal" />
     <View
-        android:id="@+id/drag_handle"
+        android:id="@+id/middle_drag_handle"
         android:layout_width="12dp"
         android:layout_height="50dp"
         android:layout_centerVertical="true"
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index c9b584d38..6c0d274b0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -96,7 +96,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Chování/UI</string>
     <string name="setting_title_data">Záloha</string>
-    <string name="setting_filter">Filtr záložek</string>
     <string name="setting_title_fav">Oblíbené</string>
     <string name="setting_title_searchEngine">Vlastní vyhledávač</string>
     <string name="setting_title_userAgent">Vlastní uživatelský agent</string>
@@ -149,7 +148,6 @@
     <string name="hint_database">Toto vymaže všechna vaše aktuální nastavení a data. Chcete pokračovat?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Licence</string>
-    <string name="setting_title_appSettings">Nastavení aplikace</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Doména byla úspěšně přidána</string>
     <string name="toast_copy_successful">Úspěšně zkopírováno</string>
@@ -167,7 +165,6 @@
     <string name="toast_start_download">Zahajování stahování</string>
     <string name="toast_wait_a_minute">Prosím, počkejte chvilku</string>
     <string name="toast_error">Jejda. Něco se pokazilo.</string>
-    <string name="toast_newTitle">Položka již existuje. Zadejte prosím nový název.</string>
     <string name="toast_edit_successful">Úspěšně uloženo</string>
     <string name="toast_webview_forward">Nelze načíst další stránku</string>
     <string name="toast_restart">Pro provedení změn musíte restartovat aplikaci „EinkBro Browser“. Ukončit nyní?</string>
@@ -179,9 +176,6 @@
     <string name="whitelist_edit_hint">Doména</string>
     <string name="whitelist_add">Přidat</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        Záložky můžete označit filtry. Tímto způsobem můžete seskupovat své záložky. Můžete otevřít dialogové okno filtru
-        dlouhým stisknutím ikony záložky. Pokud aktivujete položku, objeví se dialogové okno, kde můžete upravit název filtru.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 68c4ff409..486f59ff1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -91,7 +91,6 @@ Dies zu deaktivieren ist sicherer, schneller und spart Datenvolumen. Manche Inha
     <!-- App setting -->
     <string name="setting_title_ui">Verhalten/Oberfläche</string>
     <string name="setting_title_data">Sicherung</string>
-    <string name="setting_filter">Lesezeichen-Filter</string>
     <string name="setting_title_fav">Favorit</string>
     <string name="setting_title_searchEngine">Nutzerdefinierte Suchmaschine</string>
     <string name="setting_title_userAgent">Eigener Useragent</string>
@@ -142,7 +141,6 @@ Dies zu deaktivieren ist sicherer, schneller und spart Datenvolumen. Manche Inha
     <string name="hint_database">Dies löscht alle aktuellen Einstellungen und Daten. Willst du fortfahren?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Lizenz</string>
-    <string name="setting_title_appSettings">App-Einstellungen</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Domain erfolgreich hinzugefügt</string>
     <string name="toast_copy_successful">Erfolgreich kopiert</string>
@@ -160,7 +158,6 @@ Dies zu deaktivieren ist sicherer, schneller und spart Datenvolumen. Manche Inha
     <string name="toast_start_download">Starte Download</string>
     <string name="toast_wait_a_minute">Bitte einen Moment warten</string>
     <string name="toast_error">Uuups. Etwas ist schief gelaufen. :-(</string>
-    <string name="toast_newTitle">Eintrag existiert schon. Bitte gib einen neuen Titel ein.</string>
     <string name="toast_edit_successful">Erfolgreich gespeichert</string>
     <string name="toast_webview_forward">Kann die nächste Seite nicht laden</string>
     <string name="toast_restart">Du musst \"EinkBro Browser\" neustarten, damit die Änderungen wirksam werden. Jetzt beenden?</string>
@@ -172,8 +169,6 @@ Dies zu deaktivieren ist sicherer, schneller und spart Datenvolumen. Manche Inha
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Hinzufügen</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">Du kannst deinen Lesezeichen mit Filter markieren. So kannst du deine Lesezeichengruppieren. Den Filterdialog kannst du öffnen durch langes Drücken auf das Lesezeichen-Icon. Wenn du einen Eintrag aktivierst, erscheint ein Dialog, in dem du den Namen des Filters bearbeiten kannst.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 04498cc71..a9f9f811b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -90,7 +90,6 @@ Si desinstala la aplicación, el mismo será eliminado. Por tanto se recomienda
     <!-- App setting -->
     <string name="setting_title_ui">Comportamiento/IU</string>
     <string name="setting_title_data">Respaldos</string>
-    <string name="setting_filter">Filtro de marcadores</string>
     <string name="setting_title_fav">Favorito</string>
     <string name="setting_title_searchEngine">Motor de búsqueda personalizado</string>
     <string name="setting_title_userAgent">Agente de usuario personalizado</string>
@@ -141,7 +140,6 @@ Si desinstala la aplicación, el mismo será eliminado. Por tanto se recomienda
     <string name="hint_database">Esto borrará todas sus configuraciones y datos actuales. ¿Quiere proceder?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Licencia</string>
-    <string name="setting_title_appSettings">Configuración de la aplicación</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Dominio agregado con éxito</string>
     <string name="toast_copy_successful">Copiado con éxito</string>
@@ -159,7 +157,6 @@ Si desinstala la aplicación, el mismo será eliminado. Por tanto se recomienda
     <string name="toast_start_download">Iniciando descarga</string>
     <string name="toast_wait_a_minute">Por favor, espere un momento</string>
     <string name="toast_error">Uuups. Algo salió mal.</string>
-    <string name="toast_newTitle">La entrada ya existe. Por favor ingrese un nuevo título.</string>
     <string name="toast_edit_successful">Guardado con éxito</string>
     <string name="toast_webview_forward">No se puede cargar el sitio</string>
     <string name="toast_restart">Debe reiniciar \"Navegador EinkBro\" para aplicar cambios. ¿Cerrar ahora?</string>
@@ -171,9 +168,6 @@ Si desinstala la aplicación, el mismo será eliminado. Por tanto se recomienda
     <string name="whitelist_edit_hint">Dominio</string>
     <string name="whitelist_add">Añadir</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7ba4eb4e2..a23c4c25d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Comportement/UI</string>
     <string name="setting_title_data">Sauvegarde</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">Cela supprimera tous vos paramètres et données actuels. Allez-vous procéder?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Licence</string>
-    <string name="setting_title_appSettings">Paramètres</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Domaine ajouté avec succès</string>
     <string name="toast_copy_successful">Copié avec succès</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Démarrage du téléchargement</string>
     <string name="toast_wait_a_minute">SVP attendez un moment</string>
     <string name="toast_error">Oups. Quelque chose a mal tourné.</string>
-    <string name="toast_newTitle">L\'entrée existe déjà. Veuillez entrer un nouveau titre.</string>
     <string name="toast_edit_successful">Enregistré avec succès</string>
     <string name="toast_webview_forward">Impossible de charger le site</string>
     <string name="toast_restart">Vous devez redémarrer \"EinkBro Browser\" pour appliquer les modifications. Fermer maintenant?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domaine</string>
     <string name="whitelist_add">Ajouté</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c322d7752..257d78e7e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -92,7 +92,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Comportamento/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Filtro dei segnalibri</string>
     <string name="setting_title_fav">Preferito</string>
     <string name="setting_title_searchEngine">Motore di ricerca personalizzato</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -144,7 +143,6 @@
     <string name="hint_database">In questo modo verranno eliminate tutte le impostazioni e i dati correnti. Continuare?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Licenza</string>
-    <string name="setting_title_appSettings">Impostazioni App</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Dominio aggiunto con successo</string>
     <string name="toast_copy_successful">Copiato con successo</string>
@@ -162,7 +160,6 @@
     <string name="toast_start_download">Avvio del download</string>
     <string name="toast_wait_a_minute">Attendere un momento</string>
     <string name="toast_error">Uuups. Qualcosa è andato storto</string>
-    <string name="toast_newTitle">La voce esiste già. Per favore inserisci un nuovo titolo.</string>
     <string name="toast_edit_successful">Salvato con successo</string>
     <string name="toast_webview_forward">Non è possibile caricare il sito successivo</string>
     <string name="toast_restart">Per applicare le modifiche è necessario riavviare \"EinkBro Browser\". Chiudere ora?</string>
@@ -174,9 +171,6 @@
     <string name="whitelist_edit_hint">Dominio</string>
     <string name="whitelist_add">Aggiungi</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">Puoi segnare i tuoi segnalibri con dei filtri. In questo modo puoi raggruppare i tuoi segnalibri. Puoi aprire la finestra dei filtri
-        premendo a lungo l\'icona dei segnalibri. Se attivi una voce, una finestra apparirà, dove puoi modificare il nome del filtro.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index aaa13a6a9..079d71475 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -98,7 +98,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">動作/UI</string>
     <string name="setting_title_data">バックアップ</string>
-    <string name="setting_filter">ブックマークフィルタ</string>
     <string name="setting_title_fav">お気に入り</string>
     <string name="setting_title_searchEngine">カスタム検索エンジン</string>
     <string name="setting_title_userAgent">カスタムユーザーエージェント</string>
@@ -151,7 +150,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">ライセンス</string>
-    <string name="setting_title_appSettings">アプリ設定</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -169,7 +167,6 @@
     <string name="toast_start_download">ダウンロード開始中…</string>
     <string name="toast_wait_a_minute">少々お待ちください</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">正常に保存されました</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -181,9 +178,6 @@
     <string name="whitelist_edit_hint">ドメイン</string>
     <string name="whitelist_add">追加</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 256ff5047..97574f553 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -99,7 +99,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Gedrag/Uiterlijk</string>
     <string name="setting_title_data">Back-up</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -152,7 +151,6 @@
     <string name="hint_database">Dit verwijdert al je huidige instellingen en gegevens. Wil je doorgaan?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Licentie</string>
-    <string name="setting_title_appSettings">App-instellingen</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Domein toegevoegd</string>
     <string name="toast_copy_successful">Gekopieerd</string>
@@ -170,7 +168,6 @@
     <string name="toast_start_download">Bezig met starten van download…</string>
     <string name="toast_wait_a_minute">Even geduld…</string>
     <string name="toast_error">Oeps, er is iets misgegaan.</string>
-    <string name="toast_newTitle">Het item bestaat al; voer een nieuwe titel in.</string>
     <string name="toast_edit_successful">Opgeslagen</string>
     <string name="toast_webview_forward">Volgende site kan niet worden geladen</string>
     <string name="toast_restart">\"EinkBro-browser\" moet worden herstart om de wijzigingen toe te passen. Wil je nu afsluiten?</string>
@@ -182,9 +179,6 @@
     <string name="whitelist_edit_hint">Domein</string>
     <string name="whitelist_add">Toevoegen</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e77e2973f..e5c587d1e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -93,7 +93,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Zachowanie i wygląd</string>
     <string name="setting_title_data">Kopia zapasowa</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -145,7 +144,6 @@
     <string name="hint_database">Ta opcja wymaże twoje aktualne ustawienia i dane. Kontynuować?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Licencja</string>
-    <string name="setting_title_appSettings">Ustawienia aplikacji</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Poprawnie dodano adres witryny</string>
     <string name="toast_copy_successful">Kopiowanie zakończone</string>
@@ -163,7 +161,6 @@
     <string name="toast_start_download">Rozpoczynanie pobierania</string>
     <string name="toast_wait_a_minute">Zaczekaj chwilę</string>
     <string name="toast_error">Ups, coś poszło nie tak.</string>
-    <string name="toast_newTitle">Ten wpis już istnieje. Wprowadź nowy tytuł.</string>
     <string name="toast_edit_successful">Zapisano</string>
     <string name="toast_webview_forward">Nie można załadować kolejnej strony</string>
     <string name="toast_restart">Musisz uruchomić ponownie \"EinkBro Browser\”, aby zachować te zmiany. Zamknąć teraz?</string>
@@ -175,9 +172,6 @@
     <string name="whitelist_edit_hint">Adres</string>
     <string name="whitelist_add">Dodaj</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index f564caa7f..c4cd0d19e 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -90,7 +90,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Comportamento/Interface</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Filtro de marcadores</string>
     <string name="setting_title_fav">Favorito</string>
     <string name="setting_title_searchEngine">Motor de pesquisa personalizado</string>
     <string name="setting_title_userAgent">Agente personalizado</string>
@@ -141,7 +140,6 @@
     <string name="hint_database">Está prestes a apagar todos os dados da aplicação. Tem a certeza?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Licença</string>
-    <string name="setting_title_appSettings">Definições da aplicação</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Domínio adicionado com sucesso</string>
     <string name="toast_copy_successful">Copiado com sucesso</string>
@@ -159,7 +157,6 @@
     <string name="toast_start_download">Descarga iniciada</string>
     <string name="toast_wait_a_minute">Aguarde um pouco</string>
     <string name="toast_error">Algo errado aconteceu.</string>
-    <string name="toast_newTitle">Entrada existente. Escolha outro título.</string>
     <string name="toast_edit_successful">Adicionado com sucesso</string>
     <string name="toast_webview_forward">Não foi possível carregar o site</string>
     <string name="toast_restart">Tem que reiniciar a aplicação para aplicar as alterações. Fechar agora?</string>
@@ -171,7 +168,6 @@
     <string name="whitelist_edit_hint">Domínio</string>
     <string name="whitelist_add">Adicionar</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">Pode associar os seus marcadores a filtros. Desta forma, consegue agrupar os separadores facilmente. Assim que o fizer, pode abrir o diálogo com um toque longo no ícone Marcadores. Se ativar uma entrada surge um diálogo, no qual pode editar o nome do filtro.    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f9795d3cb..455701829 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index be6a9f313..72faf4e1c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -90,7 +90,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Поведение и интерфейс</string>
     <string name="setting_title_data">Резервное копирование</string>
-    <string name="setting_filter">Фильтр закладок</string>
     <string name="setting_title_fav">Избранное</string>
     <string name="setting_title_searchEngine">Пользовательская поисковая система</string>
     <string name="setting_title_userAgent">Произвольный юзер-агент</string>
@@ -142,7 +141,6 @@
     <string name="hint_database">Это приведет к удалению всех текущих настроек и данных. Продолжить?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Лицензия</string>
-    <string name="setting_title_appSettings">Настройки</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Успешно добавлен домен</string>
     <string name="toast_copy_successful">Успешно скопировано</string>
@@ -160,7 +158,6 @@
     <string name="toast_start_download">Начало загрузки</string>
     <string name="toast_wait_a_minute">Подождите минутку</string>
     <string name="toast_error">Что-то пошло не так.</string>
-    <string name="toast_newTitle">Запись уже существует. Введите новое название.</string>
     <string name="toast_edit_successful">Успешно сохранено</string>
     <string name="toast_webview_forward">Не удается загрузить следующий сайт</string>
     <string name="toast_restart">Чтобы применить изменения, необходимо перезапустить \"EinkBro Browser\". Закрыть сейчас?</string>
@@ -172,9 +169,6 @@
     <string name="whitelist_edit_hint">Домен</string>
     <string name="whitelist_add">Добавить</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        Вы можете присвоить своим закладкам фильтры. Так можно создавать группы закладок. Можно открыть диалог фильтров
-        удержанием нажатия на значке закладки. Если Вы активировали ввод, появится диалог, позволяющий изменить имя фильтра.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 66a9d03e7..8d5a9d74e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Davranış/Arayüz</string>
     <string name="setting_title_data">Yedekleme</string>
-    <string name="setting_filter">Yer imi süzgeci</string>
     <string name="setting_title_fav">Başlangıç sitesi</string>
     <string name="setting_title_searchEngine">Özel arama motoru</string>
     <string name="setting_title_userAgent">Özel kullanıcı aracısı</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">Bu, mevcut tüm ayarlarınızı ve verilerinizi silecektir. Devam edilsin mi?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Lisans</string>
-    <string name="setting_title_appSettings">Uygulama ayarları</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Başarıyla etki alanı eklendi</string>
     <string name="toast_copy_successful">Başarıyla kopyalandı</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">İndirmeye başla</string>
     <string name="toast_wait_a_minute">Lütfen biraz bekleyin</string>
     <string name="toast_error">Hata. Bir şeyler yanlış gitti.</string>
-    <string name="toast_newTitle">Giriş zaten mevcut. Lütfen yeni bir başlık girin.</string>
     <string name="toast_edit_successful">Başarıyla kaydedildi</string>
     <string name="toast_webview_forward">Bir sonraki site yüklenemiyor</string>
     <string name="toast_restart">Değişiklikleri uygulamak için \"EinkBro Tarayıcı\"sını yeniden başlatmanız gerekir. Şimdi kapatılsın mı?</string>
@@ -183,8 +180,6 @@
     <string name="whitelist_edit_hint">Etki alanı</string>
     <string name="whitelist_add">Ekle</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        Yer imlerinizi filtrelerle etiketleyebilirsiniz. Bu şekilde yer imlerinizi gruplandırabilirsiniz. Filtre iletişim kutusunu yer imleri
-        simgesine uzun basarak açabilirsiniz. Bir girişi aktifleştirirseniz, filtrenin adını düzenleyebileceğiniz bir iletişim kutusu görünecektir.    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 0b10bc427..7b9a56066 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -92,7 +92,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Поведінка та інтерфейс</string>
     <string name="setting_title_data">Резервне копіювання</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -144,7 +143,6 @@
     <string name="hint_database">Це призведе до видалення всіх поточних налаштувань і даних. Продовжити?</string>
     <!-- Others setting -->
     <string name="setting_title_license">Ліцензія</string>
-    <string name="setting_title_appSettings">Налаштування</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Успішно додано домен</string>
     <string name="toast_copy_successful">Успішно скопійовано</string>
@@ -162,7 +160,6 @@
     <string name="toast_start_download">Початок завантаження</string>
     <string name="toast_wait_a_minute">Будь ласка, зачекайте</string>
     <string name="toast_error">Щось пішло не так.</string>
-    <string name="toast_newTitle">Запис вже існує. Введіть нову назву.</string>
     <string name="toast_edit_successful">Успішно збережено</string>
     <string name="toast_webview_forward">Не вдається завантажити наступний сайт</string>
     <string name="toast_restart">Щоб застосувати зміни, необхідно перезапустити \"EinkBro Browser\". Закрити зараз?</string>
@@ -174,9 +171,6 @@
     <string name="whitelist_edit_hint">Домен</string>
     <string name="whitelist_add">Додати</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 8fb6caab0..47679c2ab 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -100,7 +100,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
-    <string name="setting_filter">Bookmark filter</string>
     <string name="setting_title_fav">Favorite</string>
     <string name="setting_title_searchEngine">Custom search engine</string>
     <string name="setting_title_userAgent">Custom user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1a1ab0c28..8d3ad7991 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -118,8 +118,6 @@
     <string name="setting_title_ui">用户界面/操作习惯</string>
     <string name="setting_title_data">备份</string>
 
-    <string name="setting_filter">书签过滤</string>
-
     <string name="setting_title_fav">我的主页</string>
 
     <string name="setting_title_searchEngine">自定义搜索引擎</string>
@@ -194,7 +192,6 @@
 
     <!-- Others setting -->
     <string name="setting_title_license">许可信息</string>
-    <string name="setting_title_appSettings">应用设置信息</string>
 
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">已成功添加域名</string>
@@ -213,7 +210,6 @@
     <string name="toast_start_download">开始下载</string>
     <string name="toast_wait_a_minute">请稍等</string>
     <string name="toast_error">哎，出错了！</string>
-    <string name="toast_newTitle">标题已存在，请重新输入。</string>
     <string name="toast_edit_successful">已成功保存</string>
     <string name="toast_webview_forward">无法加载下一页面</string>
     <string name="toast_restart">必须重新启动 \"EinkBro浏览器\" 才能应用更改，确定现在重启吗？</string>
@@ -230,11 +226,6 @@
 
     <!-- Dialog help -->
 
-    <string name="dialogHelp_filterText">
-        可以使用过滤标记您的书签。通过这种方式，可以对书签进行分组。通过以下方式打开过滤对话框
-        长按书签图标。如果您激活条目，将出现一个对话框，可以在其中编辑过滤名称。 
-    </string>
-
 
     <!-- Dialog changelog -->
 
@@ -283,15 +274,11 @@
 
     ]]>
     </string>
-    <string name="setting_title_toolbar_icons">工具栏图标</string>
-    <string name="setting_summary_toolbar_icons">设置工具栏上应该显示的图标</string>
     <string name="setting_summary_desktop">支持网站桌面模式</string>
     <string name="history">历史</string>
     <string name="location">位置</string>
-    <string name="desktop">桌面模式</string>
     <string name="media_continue">后台播放</string>
     <string name="show_touch_area_hint">显示触控感应区边界</string>
-    <string name="close">关闭</string>
     <string name="touch_left_side">左</string>
     <string name="touch_right_side">右</string>
     <string name="bold_font">粗体</string>
@@ -300,11 +287,7 @@
     <string name="desktop_mode">桌面模式</string>
     <string name="setting_title_page_left_value">页面预留高度</string>
     <string name="setting_summary_page_left_value">翻到下一页时预留的页面高度</string>
-    <string name="touch_area">触控感应区</string>
-    <string name="setting_summary_touch_area">配置翻页的触控感应区</string>
     <string name="setting_title_pdf_paper_size">输出PDF纸张大小</string>
-    <string name="font_style_serif">字体样式: 衬线</string>
-    <string name="setting_summary_font_style_serif">设置字体样式为: 谷歌无衬线</string>
     <string name="vertical_read">竖排文本</string>
     <string name="reader_mode">阅读模式</string>
     <string name="touch_area_setting">触控设置</string>
@@ -317,7 +300,6 @@
     <string name="book_name_description">输入图书名称</string>
     <string name="saving_epub">正在保存Epub</string>
     <string name="volume_page_turn">音量键切换</string>
-    <string name="menu_add_folder">添加书签文件夹</string>
     <string name="folder_name">书签文件夹名称</string>
     <string name="folder_name_description">插入书签文件夹名称</string>
     <string name="setting_title_export_bookmarks">导出书签</string>
@@ -357,15 +339,8 @@
     <string name="setting_title_two_finger_swipe">两指滑动</string>
     <string name="font_custom">选择自定义字体文件</string>
     <string name="translation_mode">翻译模式</string>
-    <string name="title_activity_epub_reader">Epub阅读活动</string>
     <!-- Strings used for fragments for navigation -->
-    <string name="first_fragment_label">第一片段</string>
-    <string name="second_fragment_label">第二片段</string>
-    <string name="next">下一页</string>
-    <string name="previous">上一页</string>
 
-    <string name="hello_first_fragment">您好第一片段</string>
-    <string name="hello_second_fragment">您好第二片段. Arg: %1$s</string>
     <string name="system_default">默认值</string>
     <string name="serif">衬线</string>
     <string name="googleserif">谷歌衬线</string>
@@ -388,5 +363,4 @@
     <string name="menu_send_link">Send link</string>
     <string name="done">Done</string>
     <string name="menu_receive">receive data</string>
-    <string name="new_instance">New Window</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0d559770b..f15b30bb1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -99,7 +99,6 @@
     <!-- App setting -->
     <string name="setting_title_ui">操作行為/介面</string>
     <string name="setting_title_data">備份</string>
-    <string name="setting_filter">過濾書籤</string>
     <string name="setting_title_fav">我的首頁</string>
     <string name="setting_title_searchEngine">設定搜尋引擎</string>
     <string name="setting_title_userAgent">自訂 user agent</string>
@@ -153,7 +152,6 @@
     <string name="hint_database">This will delete all your current settings and data. Will you proceed?</string>
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App 的系統設定</string>
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
     <string name="toast_copy_successful">Successfully copied</string>
@@ -171,7 +169,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -183,9 +180,6 @@
     <string name="whitelist_edit_hint">Domain</string>
     <string name="whitelist_add">Add</string>
     <!-- Dialog help -->
-    <string name="dialogHelp_filterText">        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
     <!-- Dialog changelog -->
     <!-- License changelog -->
     <string name="touch_left_side">左側</string>
@@ -197,11 +191,7 @@
     <string name="desktop_mode">桌面版網站</string>
     <string name="setting_title_page_left_value">翻頁時保留的畫面長度</string>
     <string name="setting_summary_page_left_value">翻頁時，可保留部分畫面內容，請設定要保留的長度。如不需要可以設為 0</string>
-    <string name="touch_area">點擊翻頁區域</string>
-    <string name="setting_summary_touch_area">設定點擊畫面何處會翻頁</string>
     <string name="setting_title_pdf_paper_size">設定PDF紙張大小</string>
-    <string name="font_style_serif">字型: Serif</string>
-    <string name="setting_summary_font_style_serif">將字型設為 Noto Sans Serif</string>
     <string name="vertical_read">直排閱讀</string>
     <string name="reader_mode">閱讀模式</string>
     <string name="touch_area_setting">翻頁設定</string>
@@ -216,9 +206,7 @@
     <string name="volume_page_turn">音量鍵翻頁</string>
     <string name="history">瀏覽記錄</string>
     <string name="location">位置</string>
-    <string name="desktop">桌面模式</string>
     <string name="media_continue">背景播放</string>
-    <string name="menu_add_folder">新增書籤目錄</string>
     <string name="folder_name_description">輸入書籤目錄名稱</string>
     <string name="setting_title_export_bookmarks">匯出書籤</string>
     <string name="setting_title_import_bookmarks">匯入書籤</string>
@@ -279,5 +267,4 @@
     <string name="menu_send_link">傳送網址</string>
     <string name="done">傳送完成時按此關閉</string>
     <string name="menu_receive">接收資料</string>
-    <string name="new_instance">New Window</string>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 877ba7bb4..9554d1cf9 100755
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,9 +7,7 @@
     <dimen name="layout_margin_12dp">12dp</dimen>
     <dimen name="layout_margin_8dp">8dp</dimen>
     <dimen name="menu_button_size">50dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
     <dimen name="appbar_height">50dp</dimen>
-    <dimen name="dialog_margin">55dp</dimen>
 
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5175c45fe..279146c75 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -127,8 +127,6 @@
     <string name="setting_title_ui">Behavior/UI</string>
     <string name="setting_title_data">Backup</string>
 
-    <string name="setting_filter">Bookmark filter</string>
-
     <string name="setting_title_fav">Favorite</string>
 
     <string name="setting_title_searchEngine">Custom search engine</string>
@@ -205,7 +203,6 @@
 
     <!-- Others setting -->
     <string name="setting_title_license">License</string>
-    <string name="setting_title_appSettings">App settings</string>
 
     <!-- Toast -->
     <string name="toast_add_whitelist_successful">Successfully added Domain</string>
@@ -224,7 +221,6 @@
     <string name="toast_start_download">Starting download</string>
     <string name="toast_wait_a_minute">Please wait for a moment</string>
     <string name="toast_error">Uuups. Something went wrong.</string>
-    <string name="toast_newTitle">Entry already exists. Please enter new title.</string>
     <string name="toast_edit_successful">Successfully saved</string>
     <string name="toast_webview_forward">Can\'t load next site</string>
     <string name="toast_restart">You must restart \"EinkBro Browser\" to apply changes. Close now?</string>
@@ -241,11 +237,6 @@
 
     <!-- Dialog help -->
 
-    <string name="dialogHelp_filterText">
-        You can tag your bookmarks with filters. In this way you can group your bookmarks. You can open the filter dialog by
-        long pressing the bookmark icon. If you activate an entry a dialog will appear, where you can edit the name of the filter.
-    </string>
-
 
     <!-- Dialog changelog -->
 
@@ -294,15 +285,11 @@
 
     ]]>
     </string>
-    <string name="setting_title_toolbar_icons">Icons on toolbar</string>
-    <string name="setting_summary_toolbar_icons">Decide what icons should be shown on toolbar</string>
     <string name="setting_summary_desktop">Support desktop mode of web site</string>
     <string name="history">History</string>
     <string name="location">Location</string>
-    <string name="desktop">Desktop Mode</string>
     <string name="media_continue">Bckgnd Play</string>
     <string name="show_touch_area_hint">show touch area border</string>
-    <string name="close">Close</string>
     <string name="touch_left_side">left</string>
     <string name="touch_right_side">right</string>
     <string name="bold_font">Bold font</string>
@@ -311,11 +298,7 @@
     <string name="desktop_mode">Desktop mode</string>
     <string name="setting_title_page_left_value">Page Reserved Height</string>
     <string name="setting_summary_page_left_value">How much height should be reserved when turning to next page</string>
-    <string name="touch_area">Touch Area</string>
-    <string name="setting_summary_touch_area">Configure touch area for turning pages</string>
     <string name="setting_title_pdf_paper_size">Printed pdf paper size</string>
-    <string name="font_style_serif">Font Style: Serif</string>
-    <string name="setting_summary_font_style_serif">Set font style to Noto Sans Serif</string>
     <string name="vertical_read">vertical</string>
     <string name="reader_mode">Reader mode</string>
     <string name="touch_area_setting">Touch setting</string>
@@ -328,7 +311,6 @@
     <string name="book_name_description">Input the book name</string>
     <string name="saving_epub">Saving Epub</string>
     <string name="volume_page_turn">Volume Key</string>
-    <string name="menu_add_folder">Add bookmark folder</string>
     <string name="folder_name">Bookmark folder name</string>
     <string name="folder_name_description">Insert Bookmark folder name</string>
     <string name="setting_title_export_bookmarks">export bookmarks</string>
@@ -368,15 +350,8 @@
     <string name="setting_title_two_finger_swipe">two finger swipe</string>
     <string name="font_custom">Select custom font file</string>
     <string name="translation_mode">Translation Mode</string>
-    <string name="title_activity_epub_reader">EpubReaderActivity</string>
     <!-- Strings used for fragments for navigation -->
-    <string name="first_fragment_label">First Fragment</string>
-    <string name="second_fragment_label">Second Fragment</string>
-    <string name="next">Next</string>
-    <string name="previous">Previous</string>
 
-    <string name="hello_first_fragment">Hello first fragment</string>
-    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
     <string name="system_default">Default</string>
     <string name="serif">Serif</string>
     <string name="googleserif">Google Serif</string>
@@ -399,5 +374,4 @@
     <string name="menu_send_link">Send link</string>
     <string name="done">Close when transfer is done</string>
     <string name="menu_receive">Receive data</string>
-    <string name="new_instance">New Window</string>
 </resources>