diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 676c6da7..22dc01da 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -5,6 +5,7 @@
     <inspection_tool class="AndroidLintSuspiciousImport" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BusyWait" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CodeBlock2Expr" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CollectionAddAllCanBeReplacedWithConstructor" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ConstantConditions" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
diff --git a/app/build.gradle b/app/build.gradle
index c2bf07fc..b9c953c8 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,12 +75,13 @@ android {
 dependencies {
 
     /* Android Support Repository dependencies */
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
     implementation 'com.android.support:support-core-utils:28.0.0'
@@ -89,12 +90,12 @@ dependencies {
 
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'com.google.android.material:material:1.4.0-alpha02'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
 
     /* Firefox ABI Splits */
 
@@ -107,11 +108,13 @@ dependencies {
 
     /*Crashlytics*/
 
-    implementation 'com.flurry.android:analytics:12.4.0@aar'
+    implementation 'com.flurry.android:analytics:12.13.0@aar'
 
     /* Ads Manager */
 
-    implementation 'com.google.android.gms:play-services-ads:20.1.0'
+    implementation('com.mopub:mopub-sdk:5.17.0@aar') {
+        transitive = true
+    }
 
     /* Orbot Service */
 
@@ -126,13 +129,14 @@ dependencies {
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.volley:volley:1.2.0'
     implementation 'com.github.instacart.truetime-android:library-extension-rx:3.3'
-    implementation 'net.zetetic:android-database-sqlcipher:4.4.3@aar'
+    implementation "net.zetetic:android-database-sqlcipher:4.4.3"
+    implementation "androidx.sqlite:sqlite-ktx:2.1.0"
     implementation 'com.github.apl-devs:appintro:v4.2.2'
-    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.palette:palette-ktx:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
diff --git a/app/libs/mopub-sdk-5.17.0.aar b/app/libs/mopub-sdk-5.17.0.aar
new file mode 100644
index 00000000..32d6a201
Binary files /dev/null and b/app/libs/mopub-sdk-5.17.0.aar differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c7f327cf..0a52050b 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,10 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:targetApi="n">
-        <activity android:name="com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingController"></activity>
+        <activity
+            android:name="com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingController"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+            android:windowSoftInputMode="adjustPan" />
 
         <receiver android:name="com.widget.Genesis.widgetManager.widgetController">
             <intent-filter>
@@ -278,16 +281,11 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_path" />
         </provider>
-
         <service
             android:name="org.torproject.android.service.OrbotService"
             android:enabled="true"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:stopWithTask="false">
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
-        </service>
+            android:exported="false"
+            android:stopWithTask="true" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/assets/Homepage/javascript/js-homepage.js b/app/src/main/assets/Homepage/javascript/js-homepage.js
index e1f665bd..d812d53b 100644
--- a/app/src/main/assets/Homepage/javascript/js-homepage.js
+++ b/app/src/main/assets/Homepage/javascript/js-homepage.js
@@ -74,7 +74,9 @@ $(window).on('load', function() {
 	// var mResponseJson = '[{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://wikileaks.org/static/img/wl-logo.png", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"},{ "mIcon":"https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico?v=ec617d715196", "mHeader":"Experience", "mBody":"Donec id elit non mi porta gravida at eget metus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui"}]';
 	// setTimeout(mHomepageLoader.onLoadReferenceWebsites, 500);
 	// setTimeout(mHomepageLoader.onLoadReferenceWebsiteContent, 1000, mResponseJson);
-	document.getElementById("pBody").classList.toggle('body_fadein');
+	$(document).ready(function() {
+	    $('body').hide().fadeIn('fast');
+	});
 
 	setTimeout(function (){
 	onTriggerScriptHandler(Commands.onLoadReferenceWebsites, null)
diff --git a/app/src/main/assets/Homepage/style/cs-homepage.css b/app/src/main/assets/Homepage/style/cs-homepage.css
index d7c91a62..8fb517dd 100644
--- a/app/src/main/assets/Homepage/style/cs-homepage.css
+++ b/app/src/main/assets/Homepage/style/cs-homepage.css
@@ -1,8 +1,6 @@
 /*Search*/
 body{ 
-    opacity: 0;
-    transition: opacity 2s;
-    -webkit-transition: opacity 2s; /* Safari */
+    opacity: 1;
 }
   
 .body_fadein {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingController.java
index 869b836f..a4a91e7f 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingController.java
@@ -2,29 +2,32 @@ package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSetti
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ScrollView;
 import android.widget.TextView;
-
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.appManager.activityThemeManager;
 import com.darkweb.genesissearchengine.constants.keys;
-import com.darkweb.genesissearchengine.constants.status;
 import com.darkweb.genesissearchengine.eventObserver;
+import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.darkweb.genesissearchengine.pluginManager.pluginController;
 import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
 import com.example.myapplication.R;
-
-import org.mozilla.geckoview.GeckoSession;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import static com.darkweb.genesissearchengine.constants.keys.M_ACTIVITY_RESPONSE;
+import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT;
+import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT;
+
 public class bookmarkSettingController extends AppCompatActivity {
 
     /* Private Variables */
@@ -35,10 +38,9 @@ public class bookmarkSettingController extends AppCompatActivity {
     /* UI Variables */
 
     private EditText mBookmarName;
-    private EditText mBookmarURL;
+    private TextView mBookmarURL;
+    private ScrollView mScrollView;
 
-    private TextView mBookmarkNameError;
-    private TextView mBookmarkURLError;
 
     /* Initializations */
 
@@ -58,19 +60,20 @@ public class bookmarkSettingController extends AppCompatActivity {
     private void initializeViews() {
         mBookmarName = findViewById(R.id.pBookmarkName);
         mBookmarURL = findViewById(R.id.pBookmarkURL);
-        mBookmarkNameError = findViewById(R.id.pBookmarkNameError);
-        mBookmarkURLError = findViewById(R.id.pBookmarkURLError);
+        mScrollView = findViewById(R.id.pScrollView);
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     private void initializeLocalEventHandlers() {
 
-
-        TextWatcher mTextWatcher = new TextWatcher() {
+        mBookmarName.addTextChangedListener(new TextWatcher() {
             @Override
             public void afterTextChanged(Editable s) {
                 String mBookmarkName = (String) mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_GET_BOOKMARK_NAME);
-                String mBookmarkURL = (String) mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_GET_BOOKMARK_URL);
-                mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_VALIDATE_FORM, Arrays.asList(mBookmarkName, mBookmarkURL));
+
+                boolean mValidationStatus = (boolean)mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_VALIDATE_FORM, Collections.singletonList(mBookmarkName));
+                mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_SET_BOOOKMARK_CHANGED_STATUS, Collections.singletonList(true));
+                mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_RESPONSE, Collections.singletonList(mValidationStatus));
             }
 
             @Override
@@ -81,20 +84,40 @@ public class bookmarkSettingController extends AppCompatActivity {
             public void onTextChanged(CharSequence s, int start,int before, int count) {
 
             }
-        };
+        });
 
-        mBookmarName.addTextChangedListener(mTextWatcher);
-        mBookmarURL.addTextChangedListener(mTextWatcher);
+
+        mBookmarName.setOnFocusChangeListener((v, hasFocus) -> {
+            if(!hasFocus){
+                mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM_FOCUS);
+            }
+        });
+
+        mScrollView.setOnTouchListener((v, event) -> {
+            mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM_FOCUS);
+            return false;
+        });
     }
 
-    public void initializeModels(){
+    private void initializeModels(){
         String mBookmarkName = getIntent().getStringExtra(keys.BOOKMARK_SETTING_NAME);
         String mBookmarkURL = getIntent().getStringExtra(keys.BOOKMARK_SETTING_URL);
         int mBookmarkID = getIntent().getIntExtra(keys.BOOKMARK_SETTING_ID, -1);
 
-        mBookmarkSettingViewController = new bookmarkSettingViewController(this, new bookmarkSettingViewCallback(), mBookmarName, mBookmarURL, mBookmarkNameError, mBookmarkURLError);
+        mBookmarkSettingViewController = new bookmarkSettingViewController(this, new bookmarkSettingViewCallback(), mBookmarName, mBookmarURL);
         mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_INITIALIZE, Arrays.asList(mBookmarkName,mBookmarkURL));
-        mBookmarkSettingModel = new bookmarkSettingModel(this, new bookmarkSettingModelCallback(), mBookmarkID);
+        mBookmarkSettingModel = new bookmarkSettingModel(this, new bookmarkSettingModelCallback(), mBookmarkID, mBookmarkURL);
+    }
+
+    private void initCallableResponse(bookmarkSettingEnums.eActivityResponseCommands pResponse){
+        Intent data = new Intent();
+        if(pResponse.equals(bookmarkSettingEnums.eActivityResponseCommands.M_OPEN_UPDATE_ALERT)){
+            data.putExtra(M_ACTIVITY_RESPONSE, BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT);
+        }
+        else if(pResponse.equals(bookmarkSettingEnums.eActivityResponseCommands.M_OPEN_DELETE_ALERT)){
+            data.putExtra(M_ACTIVITY_RESPONSE, BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT);
+        }
+        setResult(RESULT_OK,data);
     }
 
     /* Local Override */
@@ -126,19 +149,39 @@ public class bookmarkSettingController extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
-        onClose(null);
+        onCloseTrigger(null);
     }
 
     /* UI Redirection */
 
-    public void onClose(View view){
+    public void onCloseTrigger(View view){
         finish();
     }
 
-    public void onUpdateBookmark(View view) {
-        String mBookmarkName = (String) mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_GET_BOOKMARK_NAME);
-        String mBookmarkURL = (String) mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_GET_BOOKMARK_URL);
-        mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_UPDATE_BOOKMARK, Arrays.asList(mBookmarkName, mBookmarkURL));
+    public void onUITrigger(View view){
+        if(view.getId()==R.id.pBookmarkUpdate){
+            mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM);
+
+            String mBookmarkName = (String) mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_GET_BOOKMARK_NAME);
+            boolean mValid = (boolean) mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_VALIDATE_FORM, Collections.singletonList(mBookmarkName));
+            boolean mBookmarkChanged = (boolean) mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_GET_UPDATE_STATUS);
+
+            if(mValid){
+                mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_UPDATE_BOOKMARK, Collections.singletonList(mBookmarkName));
+                mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM_FOCUS);
+                if(mBookmarkChanged){
+                    initCallableResponse(bookmarkSettingEnums.eActivityResponseCommands.M_OPEN_UPDATE_ALERT);
+                }
+            }else {
+                mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_RESPONSE, Collections.singletonList(false));
+            }
+            onCloseTrigger(null);
+        }
+        if(view.getId()==R.id.pRemoveBookmark){
+            initCallableResponse(bookmarkSettingEnums.eActivityResponseCommands.M_OPEN_DELETE_ALERT);
+            mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_DELETE_BOOKMARK);
+            onCloseTrigger(null);
+        }
     }
 
     /* UI Callbacks */
@@ -146,7 +189,7 @@ public class bookmarkSettingController extends AppCompatActivity {
     private class bookmarkSettingViewCallback implements eventObserver.eventListener{
 
         @Override
-        public Object invokeObserver(List<Object> data, Object e_type)
+        public Object invokeObserver(List<Object> pData, Object pType)
         {
             return null;
         }
@@ -157,18 +200,6 @@ public class bookmarkSettingController extends AppCompatActivity {
         @Override
         public Object invokeObserver(List<Object> pData, Object pType)
         {
-            if(pType.equals(bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_BOOKMARK_NAME_VALIDATION_ERROR)){
-                mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_ERROR, pData);
-            }
-            else if(pType.equals(bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_BOOKMARK_URL_VALIDATION_ERROR)){
-                mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_URL_VALIDATION_ERROR, pData);
-            }
-            else if(pType.equals(bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_CLEAR_FORM)){
-                mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM);
-            }
-            else if(pType.equals(bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_CLOSE)){
-                onClose(null);
-            }
             return null;
         }
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingEnums.java
index e88c7462..08a8e2cb 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingEnums.java
@@ -3,18 +3,20 @@ package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSetti
 public class bookmarkSettingEnums
 {
     public enum eBookmarkSettingViewCommands {
-        M_INITIALIZE, M_GET_BOOKMARK_NAME, M_GET_BOOKMARK_URL, M_BOOKMARK_NAME_VALIDATION_ERROR, M_BOOKMARK_URL_VALIDATION_ERROR, M_CLEAR_FORM
+        M_INITIALIZE, M_GET_BOOKMARK_NAME, M_GET_BOOKMARK_URL, M_BOOKMARK_NAME_VALIDATION_RESPONSE, M_CLEAR_FORM, M_CLEAR_FORM_FOCUS
     }
 
     public enum eBookmarkSettingModelCommands {
-        M_GET_BOOKMARK_ID, M_UPDATE_BOOKMARK, M_CLOSE, M_VALIDATE_FORM
+        M_UPDATE_BOOKMARK, M_VALIDATE_FORM, M_SET_BOOOKMARK_CHANGED_STATUS, M_GET_UPDATE_STATUS, M_DELETE_BOOKMARK
     }
 
     public enum eBookmarkSettingViewAdapterCommands {
     }
 
     public enum eBookmarkSettingModelCallbackCommands {
-        M_CLEAR_FORM, M_BOOKMARK_NAME_VALIDATION_ERROR, M_BOOKMARK_URL_VALIDATION_ERROR,M_CLOSE
     }
 
+    public enum eActivityResponseCommands {
+        M_OPEN_UPDATE_ALERT, M_OPEN_DELETE_ALERT
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModel.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModel.java
index e5dd17da..bbc9452e 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModel.java
@@ -1,79 +1,90 @@
 package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings;
 
 import androidx.appcompat.app.AppCompatActivity;
-
+import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.constants.strings;
 import com.darkweb.genesissearchengine.dataManager.dataController;
 import com.darkweb.genesissearchengine.dataManager.dataEnums;
 import com.darkweb.genesissearchengine.eventObserver;
-
+import com.darkweb.genesissearchengine.helperManager.helperMethod;
+import com.darkweb.genesissearchengine.pluginManager.pluginController;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
-import static com.darkweb.genesissearchengine.constants.strings.BOOKMARK_SETTING_VALIDATION_ERROR_1;
-import static com.darkweb.genesissearchengine.constants.strings.BOOKMARK_SETTING_VALIDATION_ERROR_2;
+import static com.darkweb.genesissearchengine.dataManager.dataEnums.eBookmarkCommands.M_DELETE_BOOKMARK_FROM_MENU;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_DELETE_BOOKMARK;
 
 class bookmarkSettingModel
 {
+    /* Local Variables Variables */
+
+    private boolean mBookmarkUpdateStatus = false;
+    private int mBookmarkID;
+    private String mBookmarkURL;
+
     /* Private Variables */
 
     private AppCompatActivity mContext;
     private eventObserver.eventListener mEvent;
-    private int mBookmarkID;
 
-    public bookmarkSettingModel(AppCompatActivity pContext, eventObserver.eventListener pEvent, int pBookmarkID){
+    public bookmarkSettingModel(AppCompatActivity pContext, eventObserver.eventListener pEvent, int pBookmarkID, String pBookmarkURL){
         this.mContext = pContext;
         this.mEvent = pEvent;
         this.mBookmarkID = pBookmarkID;
+        this.mBookmarkURL = pBookmarkURL;
     }
 
     /* Helper Methods */
 
-    private int getBookarkID(){
-        return mBookmarkID;
+    private void onUpdateBookmark(String pBookmarkName){
+        dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_UPDATE_BOOKMARK, Arrays.asList(pBookmarkName, mBookmarkURL, mBookmarkID));
     }
 
-    private void onUpdateBookmark(String pBookmarkName, String pBookmarkURL){
-        boolean status = validateForm(pBookmarkName, pBookmarkURL);
-        if(status){
-            dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_UPDATE_BOOKMARK, Arrays.asList(pBookmarkName, pBookmarkURL, mBookmarkID));
-            mEvent.invokeObserver(null, bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_CLOSE);
-        }
-    }
-
-    private boolean validateForm(String pBookmarkName, String pBookmarkURL){
-        mEvent.invokeObserver(null, bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_CLEAR_FORM);
-        boolean mStatus = true;
+    private boolean validateForm(String pBookmarkName){
         if(pBookmarkName.equals(strings.GENERIC_EMPTY_STR)){
-            mEvent.invokeObserver(Arrays.asList(BOOKMARK_SETTING_VALIDATION_ERROR_1, false), bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_BOOKMARK_NAME_VALIDATION_ERROR);
-            mStatus = false;
+            return false;
         }else {
-            mEvent.invokeObserver(Arrays.asList(BOOKMARK_SETTING_VALIDATION_ERROR_1, true), bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_BOOKMARK_NAME_VALIDATION_ERROR);
-        }
-        if(pBookmarkURL.equals(strings.GENERIC_EMPTY_STR)){
-            mEvent.invokeObserver(Arrays.asList(strings.BOOKMARK_SETTING_VALIDATION_ERROR_2, false), bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_BOOKMARK_URL_VALIDATION_ERROR);
-            mStatus = false;
-        }else {
-            mEvent.invokeObserver(Arrays.asList(BOOKMARK_SETTING_VALIDATION_ERROR_2, true), bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_BOOKMARK_URL_VALIDATION_ERROR);
+            return true;
         }
+    }
 
-        return mStatus;
+    private boolean getBookmarkUpdateStatus(){
+        return mBookmarkUpdateStatus;
+    }
+
+    private void setBookmarkUpdateStatus(boolean pBookmarkUpdateStatus){
+        mBookmarkUpdateStatus = pBookmarkUpdateStatus;
+    }
+
+    private void onDeleteBookmark(){
+        dataController.getInstance().invokeBookmark(M_DELETE_BOOKMARK_FROM_MENU, Collections.singletonList(mBookmarkURL));
     }
 
     /* Event Observer */
 
     public Object onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands pCommands, List<Object> pData){
-        if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_GET_BOOKMARK_ID.equals(pCommands)){
-            return getBookarkID();
-        }
         if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_UPDATE_BOOKMARK.equals(pCommands)){
-            onUpdateBookmark((String) pData.get(0), (String) pData.get(1));
+            onUpdateBookmark((String) pData.get(0));
         }
         if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_VALIDATE_FORM.equals(pCommands)){
-            validateForm((String) pData.get(0), (String) pData.get(1));
+            return validateForm((String) pData.get(0));
+        }
+        if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_SET_BOOOKMARK_CHANGED_STATUS.equals(pCommands)){
+            setBookmarkUpdateStatus((boolean)pData.get(0));
+        }
+        if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_DELETE_BOOKMARK.equals(pCommands)){
+            onDeleteBookmark();
         }
         return null;
     }
 
+    public Object onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands pCommands){
+        if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_DELETE_BOOKMARK.equals(pCommands)){
+            onDeleteBookmark();
+        }
+        if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_GET_UPDATE_STATUS.equals(pCommands)){
+            return getBookmarkUpdateStatus();
+        }
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingViewController.java
index 2762a4e6..6586b6ff 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingViewController.java
@@ -2,23 +2,15 @@ package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSetti
 
 import android.widget.EditText;
 import android.widget.TextView;
-
 import androidx.appcompat.app.AppCompatActivity;
-
-import com.darkweb.genesissearchengine.appManager.settingManager.settingHomeManager.settingHomeEnums;
 import com.darkweb.genesissearchengine.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.darkweb.genesissearchengine.helperManager.sharedUIMethod;
 import com.example.myapplication.R;
-
 import org.xmlpull.v1.XmlPullParserException;
-
 import java.io.IOException;
 import java.util.List;
 
-import static com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_BOOKMARK_NAME_VALIDATION_ERROR;
-import static com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingEnums.eBookmarkSettingModelCallbackCommands.M_BOOKMARK_URL_VALIDATION_ERROR;
-
 class bookmarkSettingViewController
 {
     /* Private Variables */
@@ -29,22 +21,17 @@ class bookmarkSettingViewController
     /* UI Variables */
 
     private EditText mBookmarName;
-    private EditText mBookmarURL;
-
-    private TextView mBookmarkNameError;
-    private TextView mBookmarkURLError;
+    private TextView mBookmarURL;
 
     /* Initializations */
 
-    bookmarkSettingViewController(AppCompatActivity pContext, eventObserver.eventListener pEvent,EditText pBookmarName,EditText pBookmarURL, TextView pBookmarkNameError, TextView pBookmarkURLError)
+    bookmarkSettingViewController(AppCompatActivity pContext, eventObserver.eventListener pEvent,EditText pBookmarName,TextView pBookmarURL)
     {
         this.mContext = pContext;
         this.mEvent = pEvent;
 
         this.mBookmarName = pBookmarName;
         this.mBookmarURL = pBookmarURL;
-        this.mBookmarkNameError = pBookmarkNameError;
-        this.mBookmarkURLError = pBookmarkURLError;
 
         initPostUI();
     }
@@ -62,46 +49,31 @@ class bookmarkSettingViewController
         return mBookmarName.getText().toString();
     }
 
-    private String getBookmarkURL(){
-        return mBookmarURL.getText().toString();
-    }
-
-    private void mBookmarkNameValidationError(bookmarkSettingEnums.eBookmarkSettingViewCommands pCommands, String pMessage, boolean pStatus){
+    private void mBookmarkNameValidationError(bookmarkSettingEnums.eBookmarkSettingViewCommands pCommands, boolean pStatus){
         try {
-            if(pCommands.equals(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_ERROR)){
+            if(pCommands.equals(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_RESPONSE)){
                 if(!pStatus){
                     mBookmarName.setBackground(helperMethod.getDrawableXML(mContext, R.xml.gx_generic_input_error));
-                    mBookmarkNameError.animate().setDuration(150).alpha(1);
-                    mBookmarkNameError.setText(pMessage);
                 }else {
-                    mBookmarName.setBackground(helperMethod.getDrawableXML(mContext, R.xml.gx_generic_input));
-                    mBookmarkNameError.animate().setDuration(150).alpha(0);
-                    mBookmarkNameError.setText(pMessage);
+                    mBookmarName.setBackground(helperMethod.getDrawableXML(mContext, R.xml.bx_input_field));
                 }
             }
-            if(pCommands.equals(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_URL_VALIDATION_ERROR)){
-                if(!pStatus){
-                    mBookmarURL.setBackground(helperMethod.getDrawableXML(mContext, R.xml.gx_generic_input_error));
-                    mBookmarkURLError.animate().setDuration(150).alpha(1);
-                    mBookmarkURLError.setText(pMessage);
-                }else {
-                    mBookmarURL.setBackground(helperMethod.getDrawableXML(mContext, R.xml.gx_generic_input));
-                    mBookmarkURLError.animate().setDuration(150).alpha(0);
-                    mBookmarkURLError.setText(pMessage);
-                }
-            }
-        } catch (Exception ignored) {
+        } catch (IOException | XmlPullParserException e) {
+            e.printStackTrace();
         }
     }
 
     private void onClearForm(){
         try {
-            mBookmarName.setBackground(helperMethod.getDrawableXML(mContext, R.xml.gx_generic_input));
-            mBookmarURL.setBackground(helperMethod.getDrawableXML(mContext, R.xml.gx_generic_input));
-
-        } catch (Exception ignored) {
+            mBookmarName.setBackground(helperMethod.getDrawableXML(mContext, R.xml.bx_input_field));
+        } catch (IOException | XmlPullParserException e) {
+            e.printStackTrace();
         }
+    }
 
+    private void onClearFormFocus(){
+        mBookmarName.clearFocus();
+        helperMethod.hideKeyboard(mContext);
     }
 
     /* Event Observer */
@@ -110,8 +82,8 @@ class bookmarkSettingViewController
         if(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_INITIALIZE.equals(pCommands)){
             initializeBookmark((String)pData.get(0), (String) pData.get(1));
         }
-        if(pCommands.equals(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_ERROR) || pCommands.equals(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_URL_VALIDATION_ERROR)){
-            mBookmarkNameValidationError(pCommands, (String)pData.get(0), (boolean)pData.get(1));
+        if(pCommands.equals(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_RESPONSE)){
+            mBookmarkNameValidationError(pCommands, (boolean)pData.get(0));
         }
         return null;
     }
@@ -120,12 +92,12 @@ class bookmarkSettingViewController
         if(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_GET_BOOKMARK_NAME.equals(pCommands)){
             return getBookmarkName();
         }
-        else if(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_GET_BOOKMARK_URL.equals(pCommands)){
-            return getBookmarkURL();
-        }
         else if(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM.equals(pCommands)){
             onClearForm();
         }
+        else if(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM_FOCUS.equals(pCommands)){
+            onClearFormFocus();
+        }
         return null;
     }
 }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkAdapter.java
index b822296f..c21fc207 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkAdapter.java
@@ -359,7 +359,7 @@ public class bookmarkAdapter extends RecyclerView.Adapter<bookmarkAdapter.listVi
     }
 
     private void onClose(int pIndex){
-        mEvent.invokeObserver(Collections.singletonList(mRealIndex.get(pIndex)),enums.etype.url_clear);
+        //mEvent.invokeObserver(Collections.singletonList(mRealIndex.get(pIndex)),enums.etype.url_clear);
         mEvent.invokeObserver(Collections.singletonList(mRealID.get(pIndex)),enums.etype.url_clear_at);
         mEvent.invokeObserver(Collections.singletonList(mRealID.get(pIndex)),enums.etype.is_empty);
 
@@ -415,6 +415,8 @@ public class bookmarkAdapter extends RecyclerView.Adapter<bookmarkAdapter.listVi
                 mRowContainer.setVisibility(View.GONE);
                 mRowMenu.setVisibility(View.INVISIBLE);
                 mRowMenu.setClickable(false);
+                mBookmarkEdit.setVisibility(View.INVISIBLE);
+                mBookmarkEdit.setClickable(false);
                 mWebLogo.setVisibility(View.GONE);
                 mLoadingContainer.setVisibility(View.GONE);
             }
@@ -424,6 +426,8 @@ public class bookmarkAdapter extends RecyclerView.Adapter<bookmarkAdapter.listVi
                 mRowContainer.setVisibility(View.GONE);
                 mRowMenu.setVisibility(View.INVISIBLE);
                 mRowMenu.setClickable(false);
+                mBookmarkEdit.setVisibility(View.INVISIBLE);
+                mBookmarkEdit.setClickable(false);
                 mWebLogo.setVisibility(View.GONE);
                 mLoadingContainer.setVisibility(View.VISIBLE);
                 return;
@@ -435,9 +439,13 @@ public class bookmarkAdapter extends RecyclerView.Adapter<bookmarkAdapter.listVi
                 if(mLongSelectedID.size()>0){
                     mRowMenu.setVisibility(View.INVISIBLE);
                     mRowMenu.setClickable(false);
+                    mBookmarkEdit.setVisibility(View.INVISIBLE);
+                    mBookmarkEdit.setClickable(false);
                 }else {
                     mRowMenu.setVisibility(View.VISIBLE);
                     mRowMenu.setClickable(true);
+                    mBookmarkEdit.setVisibility(View.VISIBLE);
+                    mBookmarkEdit.setClickable(true);
                 }
                 mWebLogo.setVisibility(View.VISIBLE);
                 mHeader.setText(model.getHeader());
@@ -462,12 +470,17 @@ public class bookmarkAdapter extends RecyclerView.Adapter<bookmarkAdapter.listVi
             if(mLongSelectedID.size()>0){
                 mRowMenu.setVisibility(View.INVISIBLE);
                 mRowMenu.setClickable(false);
+                mBookmarkEdit.setVisibility(View.INVISIBLE);
+                mBookmarkEdit.setClickable(false);
+                mBookmarkEdit.setClickable(false);
             }else {
                 mRowMenu.setVisibility(View.VISIBLE);
                 mRowMenu.setClickable(true);
+                mBookmarkEdit.setVisibility(View.VISIBLE);
+                mBookmarkEdit.setClickable(true);
             }
 
-            if(mLongSelectedIndex.contains("https://" + model.getDescription()) && mLongSelectedID.contains(model.getID())){
+            if(mLongSelectedID.contains(model.getID())){
                 mPopupWindow = (PopupWindow) mHistroyAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_SELECT_VIEW, Arrays.asList(mRowContainer, mRowMenu, mSelectionImage, true, false));
             }else if(mSelectionImage.getAlpha()>0){
                 mPopupWindow = (PopupWindow) mHistroyAdapterView.onTrigger(bookmarkEnums.eBookmarkViewAdapterCommands.M_CLEAR_HIGHLIGHT, Arrays.asList(mRowContainer, mRowMenu, mSelectionImage, true, false));
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkController.java
index 72d59393..b7d6c5ff 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkController.java
@@ -46,8 +46,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import static com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkHome.bookmarkEnums.eBookmarkViewCommands.M_VERTIFY_SELECTION_MENU;
+import static com.darkweb.genesissearchengine.constants.keys.M_ACTIVITY_RESPONSE;
+import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT;
+import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT;
 import static com.darkweb.genesissearchengine.constants.sql.SQL_CLEAR_BOOKMARK;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_CLEAR_BOOKMARK;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_DELETE_BOOKMARK;
+import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_UPDATE_BOOKMARK;
 
 
 public class bookmarkController extends AppCompatActivity
@@ -59,17 +64,20 @@ public class bookmarkController extends AppCompatActivity
     private bookmarkAdapter mbookmarkAdapter;
     private LinearLayout mHeaderContainer;
     private TextView mTitle;
+    private bookmarkViewController mbookmarkViewController;
 
     /*Private Views*/
 
-    private ImageView mEmptyListNotification;
+    private TextView mEmptyListNotification;
     private editTextManager mSearchInput;
     private RecyclerView mRecycleView;
     private Button mClearButton;
     private ImageButton mMenuButton;
     private ImageButton mSearchButton;
 
-    private bookmarkViewController mbookmarkViewController;
+    /*Local Variables*/
+
+    private int mResponseRequestCode = 10113;
 
     /*Initializations*/
 
@@ -98,6 +106,7 @@ public class bookmarkController extends AppCompatActivity
 
     public void initializeListModel(){
         mbookmarkModel = new bookmarkModel();
+        activityContextManager.getInstance().setBookmarkController(this);
         mHomeController = activityContextManager.getInstance().getHomeController();
     }
 
@@ -179,7 +188,8 @@ public class bookmarkController extends AppCompatActivity
 
     @Override
     protected void onDestroy() {
-        activityContextManager.getInstance().setBookmarkController(null);
+        activityContextManager.getInstance().onRemoveStack(this);
+        activityContextManager.getInstance().setHistoryController(null);
         super.onDestroy();
     }
 
@@ -276,6 +286,23 @@ public class bookmarkController extends AppCompatActivity
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data){
+        if(requestCode==mResponseRequestCode){
+            if(data!=null){
+                if(data.getExtras().getString(M_ACTIVITY_RESPONSE).equals(BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT)){
+                    pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_UPDATE_BOOKMARK);
+                }
+                else if(data.getExtras().getString(M_ACTIVITY_RESPONSE).equals(BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT)){
+                    initializeList();
+                    pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_DELETE_BOOKMARK);
+                }
+            }
+        }else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
     /* UI Redirection */
 
     public void onBackPressed(View view){
@@ -328,11 +355,6 @@ public class bookmarkController extends AppCompatActivity
         mRecycleView.setAlpha(0);
     }
 
-    public void onOpenBookmarkSetting() {
-        Intent intent = new Intent(getApplicationContext(), bookmarkSettingController.class);
-        startActivity(intent);
-    }
-
     /*Event Observer*/
 
     public class edittextManagerCallback implements eventObserver.eventListener {
@@ -366,7 +388,7 @@ public class bookmarkController extends AppCompatActivity
             }
 
             else if(e_type.equals(enums.etype.url_clear)){
-                mbookmarkModel.onManualClear((int)data.get(0));
+                dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_DELETE_BOOKMARK ,data);
             }
             else if(e_type.equals(enums.etype.url_clear_at)){
                 dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_DELETE_BOOKMARK ,data);
@@ -385,7 +407,7 @@ public class bookmarkController extends AppCompatActivity
                 intent.putExtra(keys.BOOKMARK_SETTING_NAME, (String) data.get(0));
                 intent.putExtra(keys.BOOKMARK_SETTING_URL, (String) data.get(1));
                 intent.putExtra(keys.BOOKMARK_SETTING_ID, (int) data.get(2));
-                startActivity(intent);
+                startActivityForResult(intent, mResponseRequestCode);
             }
             return null;
         }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkViewController.java
index 53e46012..5ccc6ee7 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/bookmarkHome/bookmarkViewController.java
@@ -16,7 +16,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -40,7 +39,7 @@ class bookmarkViewController
 {
     /*Private Variables*/
     private AppCompatActivity mContext;
-    private ImageView mEmptyListNotification;
+    private TextView mEmptyListNotification;
     private EditText mSearchInput;
     private RecyclerView mRecycleView;
     private Button mClearButton;
@@ -56,7 +55,7 @@ class bookmarkViewController
 
     /*Initializations*/
 
-    bookmarkViewController(ImageView pEmptyListNotification, EditText pSearchInput, RecyclerView pRecycleView, Button pClearButton,AppCompatActivity pContext,ImageButton pMenuButton,ImageButton pSearchButton, LinearLayout pHeaderContainer, TextView pTitle)
+    bookmarkViewController(TextView pEmptyListNotification, EditText pSearchInput, RecyclerView pRecycleView, Button pClearButton,AppCompatActivity pContext,ImageButton pMenuButton,ImageButton pSearchButton, LinearLayout pHeaderContainer, TextView pTitle)
     {
         this.mEmptyListNotification = pEmptyListNotification;
         this.mSearchInput = pSearchInput;
@@ -91,9 +90,9 @@ class bookmarkViewController
 
     private void updateIfListEmpty(int pSize,int pDuration){
         if(pSize>0){
-            mClearButton.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_setting_heading));
+            mClearButton.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_short_header));
             mEmptyListNotification.animate().setDuration(pDuration).alpha(0f);
-            mClearButton.setText(strings.HISTORY_CLEAR_HISTORY);
+            mClearButton.setText(strings.BOOKMARK_CLEAR_BOOKMARK);
             mClearButton.setClickable(true);
             mRecycleView.setVisibility(View.VISIBLE);
         }
@@ -142,7 +141,7 @@ class bookmarkViewController
         }else {
             if (mSearchInput.getVisibility() != View.VISIBLE) {
                 mClearButton.setClickable(true);
-                mClearButton.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_setting_heading));
+                mClearButton.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_short_header));
             }
             mMenuButton.setVisibility(View.GONE);
             mSearchButton.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyController.java
index 77313025..cbec4955 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyController.java
@@ -60,7 +60,7 @@ public class historyController extends AppCompatActivity
 
     /*Private Views*/
 
-    private ImageView mEmptyListNotification;
+    private TextView mEmptyListNotification;
     private editTextManager mSearchInput;
     private RecyclerView mRecycleView;
     private Button mClearButton;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyViewController.java
index 1ae76ff8..67377150 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/historyManager/historyViewController.java
@@ -7,7 +7,6 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.os.Build;
-import android.os.Handler;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -17,7 +16,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -40,7 +38,7 @@ class historyViewController
 {
     /*Private Variables*/
     private AppCompatActivity mContext;
-    private ImageView mEmptyListNotification;
+    private TextView mEmptyListNotification;
     private EditText mSearchInput;
     private RecyclerView mRecycleView;
     private Button mClearButton;
@@ -55,7 +53,7 @@ class historyViewController
 
     /*Initializations*/
 
-    historyViewController(ImageView pEmptyListNotification, EditText pSearchInput, RecyclerView pRecycleView, Button pClearButton,AppCompatActivity pContext,ImageButton pMenuButton,ImageButton pSearchButton, LinearLayout pHeaderContainer, TextView pTitle)
+    historyViewController(TextView pEmptyListNotification, EditText pSearchInput, RecyclerView pRecycleView, Button pClearButton,AppCompatActivity pContext,ImageButton pMenuButton,ImageButton pSearchButton, LinearLayout pHeaderContainer, TextView pTitle)
     {
         this.mEmptyListNotification = pEmptyListNotification;
         this.mSearchInput = pSearchInput;
@@ -89,7 +87,7 @@ class historyViewController
 
     private void updateIfListEmpty(int pSize,int pDuration){
         if(pSize>0){
-            mClearButton.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_setting_heading));
+            mClearButton.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_short_header));
             mEmptyListNotification.animate().setDuration(pDuration).alpha(0f);
             mClearButton.setText(strings.HISTORY_CLEAR_HISTORY);
             mClearButton.setClickable(true);
@@ -115,6 +113,7 @@ class historyViewController
             mClearButton.getLayoutParams().height = 0;
             mClearButton.requestLayout();
             mRecycleView.setVisibility(View.GONE);
+            mClearButton.setVisibility(View.GONE);
         }
     }
 
@@ -139,7 +138,7 @@ class historyViewController
         }else {
             if (mSearchInput.getVisibility() != View.VISIBLE) {
                 mClearButton.setClickable(true);
-                mClearButton.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_setting_heading));
+                mClearButton.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_short_header));
             }
             mMenuButton.setVisibility(View.GONE);
             mSearchButton.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java
index b4130698..bd9a825d 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java
@@ -63,7 +63,9 @@ public class geckoClients
             mSession = (geckoSession) geckoView.getSession();
         }
         else {
-            geckoView.releaseSession();
+            if(geckoView.getSession()!=null){
+                geckoView.releaseSession();
+            }
             mSession = new geckoSession(new geckoViewClientCallback(),mSessionID,context, geckoView);
             mSession.open(mRuntime);
             mSession.getSettings().setUseTrackingProtection(status.sStatusDoNotTrack);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoDownloadManager.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoDownloadManager.java
index e1dceb35..bd885d92 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoDownloadManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoDownloadManager.java
@@ -11,6 +11,7 @@ import androidx.core.content.ContextCompat;
 import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.constants.strings;
 import com.darkweb.genesissearchengine.eventObserver;
+import com.darkweb.genesissearchengine.helperManager.helperMethod;
 
 import org.mozilla.geckoview.WebResponse;
 
@@ -45,17 +46,21 @@ class geckoDownloadManager
             return;
         }
 
+        String mURL = helperMethod.getHost(session.getCurrentURL());
         try{
+            if(mURL.length()>25){
+                mURL = mURL.substring(0,25);
+            }
+
             String mFileName = DownloadUtils.guessFileName(response.headers.get("Content-Disposition"),"",response.uri,null);
             downloadURL = Uri.parse(response.uri);
             downloadFile = mFileName;
         }catch (Exception ex){
             ex.printStackTrace();
-            Log.i("sadsad",ex.getMessage());
         }
 
         event.invokeObserver(Arrays.asList(0,session.getSessionID()), enums.etype.progress_update);
-        event.invokeObserver(Arrays.asList(downloadFile.toString(),session.getSessionID(),downloadURL.toString()), enums.etype.download_file_popup);
+        event.invokeObserver(Arrays.asList(downloadFile,session.getSessionID(),mURL), enums.etype.download_file_popup);
     }
 
     Uri getDownloadURL(){
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java
index 1150180d..865de656 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java
@@ -696,7 +696,7 @@ geckoSession extends GeckoSession implements GeckoSession.MediaDelegate,GeckoSes
     @UiThread
     public void onCrash(@NonNull GeckoSession session) {
         if(!mClosed && status.sSettingIsAppStarted){
-            if(event!=null){
+            if(event==null){
                 return;
             }
             Object mSessionObject = event.invokeObserver(null, enums.etype.SESSION_ID);
@@ -721,7 +721,7 @@ geckoSession extends GeckoSession implements GeckoSession.MediaDelegate,GeckoSes
     @UiThread
     public void onKill(@NonNull GeckoSession session) {
         if(!mClosed && status.sSettingIsAppStarted){
-            if(event!=null){
+            if(event==null){
                 return;
             }
             Object mSessionObject = event.invokeObserver(null, enums.etype.SESSION_ID);
@@ -763,8 +763,8 @@ geckoSession extends GeckoSession implements GeckoSession.MediaDelegate,GeckoSes
             title = var4.title;
         }
         if(var4.type!=0 && var4.srcUri!=null){
-            if(1!=1 && var4.linkUri!=null){
-                event.invokeObserver(Arrays.asList(var4.linkUri,mSessionID,var4.srcUri,title, mTheme, mContext.get()), M_LONG_PRESS_WITH_LINK);
+            if(var4.linkUri!=null){
+                event.invokeObserver(Arrays.asList(var4.linkUri,mSessionID,var4.srcUri,title, mTheme, var4.altText, mContext.get()), M_LONG_PRESS_WITH_LINK);
             }
             else {
                 try{
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/selectionActionDelegate.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/selectionActionDelegate.java
index b815d146..0d3b47f2 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/selectionActionDelegate.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/selectionActionDelegate.java
@@ -252,7 +252,6 @@ public class selectionActionDelegate implements ActionMode.Callback,
         }
         mSelection.execute(id);
 
-        // Android behavior is to clear selection on copy.
         if (ACTION_COPY.equals(id)) {
             if (mUseFloatingToolbar) {
                 clearSelection();
@@ -430,7 +429,8 @@ public class selectionActionDelegate implements ActionMode.Callback,
 
         try{
             if (mUseFloatingToolbar) {
-                if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                String strManufacturer = android.os.Build.MANUFACTURER;
+                if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1 || (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1 && strManufacturer.equals("samsung"))) {
                     mActionMode = mActivity.startActionMode(this);
                 }else {
                     mActionMode = mActivity.startActionMode(new Callback2Wrapper(),ActionMode.TYPE_FLOATING);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/editTextManager.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/editTextManager.java
index dd9fc092..f6a3730c 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/editTextManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/editTextManager.java
@@ -24,6 +24,7 @@ public class editTextManager  extends androidx.appcompat.widget.AppCompatAutoCom
         mContext = context;
     }
 
+
     public editTextManager(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java
index aa9a7568..8edc6f79 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java
@@ -44,6 +44,7 @@ import androidx.fragment.app.FragmentContainerView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
+import com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingController;
 import com.darkweb.genesissearchengine.appManager.bookmarkManager.bookmarkHome.bookmarkController;
 import com.darkweb.genesissearchengine.appManager.historyManager.historyController;
 import com.darkweb.genesissearchengine.dataManager.models.historyRowModel;
@@ -74,7 +75,8 @@ import com.darkweb.genesissearchengine.libs.trueTime.trueTime;
 import com.darkweb.genesissearchengine.pluginManager.pluginController;
 import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
 import com.example.myapplication.R;
-import com.google.android.gms.ads.AdView;
+import com.mopub.mobileads.MoPubView;
+
 import org.mozilla.geckoview.ContentBlocking;
 import org.mozilla.geckoview.GeckoResult;
 import org.mozilla.geckoview.GeckoSession;
@@ -82,7 +84,6 @@ import org.torproject.android.service.OrbotService;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.wrapper.LocaleHelper;
 import org.torproject.android.service.wrapper.orbotLocalConstants;
-
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -93,6 +94,9 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.Callable;
+
+import mozilla.components.support.utils.DownloadUtils;
+
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
 import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode;
@@ -107,7 +111,11 @@ import static com.darkweb.genesissearchengine.constants.enums.etype.M_INITIALIZE
 import static com.darkweb.genesissearchengine.constants.enums.etype.M_NEW_LINK_IN_NEW_TAB;
 import static com.darkweb.genesissearchengine.constants.enums.etype.WAS_SCROLL_CHANGED;
 import static com.darkweb.genesissearchengine.constants.enums.etype.open_new_tab;
+import static com.darkweb.genesissearchengine.constants.keys.M_ACTIVITY_RESPONSE;
+import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT;
+import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT;
 import static com.darkweb.genesissearchengine.constants.sql.SQL_CLEAR_HISTORY;
+import static com.darkweb.genesissearchengine.dataManager.dataEnums.eBookmarkCommands.M_INTENT_BOOKMARK;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.*;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManagerCallbacks.M_RATE_APPLICATION;
 import static java.lang.Character.isLetter;
@@ -132,7 +140,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     private ImageView mLoadingIcon;
     private ImageView mBlocker;
     private TextView mLoadingText;
-    private AdView mBannerAds = null;
+    private MoPubView mBannerAds = null;
     private ImageButton mGatewaySplash;
     private ImageButton mPanicButton;
     private ImageButton mPanicButtonLandscape;
@@ -180,6 +188,8 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     private Handler mScrollHandler = null;
     private Runnable mScrollRunnable = null;
 
+    private int mResponseRequestCode = 10112;
+
     /*-------------------------------------------------------INITIALIZATION-------------------------------------------------------*/
 
     @RequiresApi(api = Build.VERSION_CODES.M)
@@ -255,7 +265,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
     }
 
     public void initAdmob(){
-        pluginController.getInstance().onAdsInvoke(Collections.singletonList(this), pluginEnums.eAdManager.M_INITIALIZE_BANNER_ADS);
+        new Handler().postDelayed(() ->
+        {
+            pluginController.getInstance().onAdsInvoke(Collections.singletonList(this), pluginEnums.eAdManager.M_INITIALIZE_BANNER_ADS);
+        }, 10000);
     }
 
     public void onInitBooleans(){
@@ -1204,7 +1217,8 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         initLocalLanguage();
 
         helperMethod.hideKeyboard(this);
-        mHomeViewController.onOpenMenu(view,mGeckoClient.canGoForward(),!(mProgressBar.getAlpha()<=0 || mProgressBar.getVisibility() == View.INVISIBLE || mGeckoClient.isLoaded()),mGeckoClient.getUserAgent(), mGeckoClient.getSession().getCurrentURL());
+        boolean mBookmarked = (boolean) dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_BOOKMARK_AVAILABLE, Collections.singletonList(mGeckoClient.getSession().getCurrentURL()));
+        mHomeViewController.onOpenMenu(view,mGeckoClient.canGoForward(),!(mProgressBar.getAlpha()<=0 || mProgressBar.getVisibility() == View.INVISIBLE || mGeckoClient.isLoaded()),mGeckoClient.getUserAgent(), mGeckoClient.getSession().getCurrentURL(), mBookmarked);
 
         view.setClickable(false);
         new Handler().postDelayed(() ->
@@ -1298,21 +1312,11 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             handler.postDelayed(() -> mGeckoClient.onRedrawPixel(homeController.this), 300);
             if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
                 mHomeViewController.setOrientation(true);
-                if(mGeckoClient.getFullScreenStatus())
-                {
-                    mHomeViewController.onSetBannerAdMargin(false, true);
-                }
-
-
+                mHomeViewController.removeBanner();
             } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT){
                 mHomeViewController.setOrientation(false);
-                if(mGeckoClient.getFullScreenStatus())
-                {
-                    mHomeViewController.onSetBannerAdMargin(true,(boolean)pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
-                }
-
                 if(mGeckoClient.getSession().wasPreviousErrorPage() || mGeckoClient.getSession().getCurrentURL().equals("about:blank") || mGeckoClient.getSession().getCurrentURL().contains("genesishiddentechnologies.com") || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_URL_CACHED_DARK) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE) || mGeckoClient.getSession().getCurrentURL().startsWith(CONST_GENESIS_HELP_URL_CACHE_DARK)){
-                    mHomeViewController.updateBannerAdvertStatus(false, (boolean)pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
+                    mHomeViewController.removeBanner();
                 }else {
                     mHomeViewController.updateBannerAdvertStatus(true, (boolean)pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED));
                 }
@@ -1328,11 +1332,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(),false,true, true);
 
             //mHomeViewController.initTopBarPadding();
-            mHomeViewController.onSetBannerAdMargin(!mGeckoClient.isLoading(),(boolean)pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)&&!!mGeckoClient.isLoading());
+            //mHomeViewController.onSetBannerAdMargin(!mGeckoClient.isLoading(),(boolean)pluginController.getInstance().onAdsInvoke(null, pluginEnums.eAdManager.M_IS_ADVERT_LOADED)&&!!mGeckoClient.isLoading());
 
             mHomeViewController.expandTopBar(false, mGeckoView.getMaxY());
             status.sUIInteracted = true;
-            mHomeViewController.onFullScreen(false);
     }
 
     @Override
@@ -1404,7 +1407,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
         if(status.sSettingIsAppStarted){
             mHomeViewController.onClearSelections(isKeyboardOpened);
-            pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
+            //pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
         }
 
         if(mAppBar!=null){
@@ -1426,7 +1429,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_INIT_LOCALE);
             mHomeViewController.onUpdateSearchEngineBar(false, 0);
             mNewTab.setPressed(false);
-            pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
+            //pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
         }
 
         if(status.sSettingIsAppStarted && !status.mThemeApplying){
@@ -1503,6 +1506,17 @@ public class homeController extends AppCompatActivity implements ComponentCallba
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data){
+        if(requestCode==mResponseRequestCode){
+            if(data!=null){
+                if(data.getExtras().getString(M_ACTIVITY_RESPONSE).equals(BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT)){
+                    pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_UPDATE_BOOKMARK);
+                }
+                else if(data.getExtras().getString(M_ACTIVITY_RESPONSE).equals(BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT)){
+                    pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_DELETE_BOOKMARK);
+                }
+            }
+        }
+
         if(requestCode==100){
             if(resultCode == RESULT_OK && null != data){
                 mSearchbar.clearFocus();
@@ -1522,6 +1536,9 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         else {
             super.onActivityResult(requestCode, resultCode, data);
         }
+
+        // pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(activityContextManager.getInstance().getHomeController()), M_UPDATE_BOOKMARK);
+
     }
 
     public void onSetBannerAdMargin(){
@@ -1580,7 +1597,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
         mGeckoClient.manualDownloadWithName(pURL,pPath,this);
     }
 
-    public AdView getBannerAd()
+    public MoPubView getBannerAd()
     {
         return mBannerAds;
     }
@@ -1678,7 +1695,8 @@ public class homeController extends AppCompatActivity implements ComponentCallba
             }
         }
         else if (menuId == R.id.menuItem25) {
-            pluginController.getInstance().onMessageManagerInvoke(Arrays.asList(mGeckoClient.getSession().getCurrentURL(), this), M_DOWNLOAD_SINGLE);
+            String mFileName = DownloadUtils.guessFileName(null,"",mGeckoClient.getSession().getCurrentURL(),null);
+            pluginController.getInstance().onMessageManagerInvoke(Arrays.asList(mFileName, mGeckoClient.getSession().getSessionID(), mGeckoClient.getSession().getCurrentURL(), this), M_DOWNLOAD_SINGLE);
         }
         else {
             mSearchbar.clearFocus();
@@ -1791,8 +1809,14 @@ public class homeController extends AppCompatActivity implements ComponentCallba
                 mGeckoClient.onForwardPressed();
             }
             if (menuId == R.id.menu23) {
-                helperMethod.hideKeyboard(this);
-                pluginController.getInstance().onMessageManagerInvoke(Arrays.asList(mGeckoClient.getSession().getCurrentURL(), this), M_BOOKMARK);
+                if(view.getTag()!=null && view.getTag().equals("mMarked")){
+                    Intent intent = new Intent(getApplicationContext(), bookmarkSettingController.class);
+                    intent = (Intent)dataController.getInstance().invokeBookmark(M_INTENT_BOOKMARK, Arrays.asList(intent, mGeckoClient.getSession().getCurrentURL()));
+                    startActivityForResult(intent, mResponseRequestCode);
+                }else{
+                    helperMethod.hideKeyboard(this);
+                    pluginController.getInstance().onMessageManagerInvoke(Arrays.asList(mGeckoClient.getSession().getCurrentURL(), this), M_BOOKMARK);
+                }
             }
             if (menuId == R.id.menu24) {
                 helperMethod.hideKeyboard(this);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java
index d07a88a1..3863e668 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java
@@ -27,6 +27,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.animation.AccelerateInterpolator;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
 import androidx.appcompat.app.AppCompatActivity;
@@ -45,13 +46,11 @@ import com.darkweb.genesissearchengine.libs.views.ColorAnimator;
 import com.darkweb.genesissearchengine.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
 import com.example.myapplication.R;
-import com.google.android.gms.ads.AdView;
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.appbar.CollapsingToolbarLayout;
+import com.mopub.mobileads.MoPubView;
 
 import org.mozilla.geckoview.GeckoView;
 import org.torproject.android.service.wrapper.orbotLocalConstants;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -77,7 +76,7 @@ class homeViewController
     private editTextManager mSearchbar;
     private ConstraintLayout mSplashScreen;
     private TextView mLoadingText;
-    private AdView mBannerAds = null;
+    private com.mopub.mobileads.MoPubView mBannerAds = null;
     private Handler mUpdateUIHandler = null;
     private ImageButton mGatewaySplash;
     private LinearLayout mTopBar;
@@ -121,7 +120,7 @@ class homeViewController
     private Runnable mTabDialogRunnable = null;
     private boolean mIsTopBarExpanded = true;
 
-    void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, AdView banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, ProgressBar pProgressBarIndeterminate, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, View pPopupLoadNewTab, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo,ImageButton pPanicButtonLandscape){
+    void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, MoPubView banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, ProgressBar pProgressBarIndeterminate, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, View pPopupLoadNewTab, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo, ImageButton pPanicButtonLandscape){
         this.mContext = context;
         this.mProgressBar = progressBar;
         this.mSearchbar = searchbar;
@@ -568,8 +567,8 @@ class homeViewController
             initSplashLoading();
         });
         mGatewaySplash.animate().setDuration(350).alpha(0.4f);
-        mPanicButtonLandscape.animate().setDuration(170).translationXBy(helperMethod.pxFromDp(55));
-        mPanicButton.animate().setDuration(170).translationXBy(helperMethod.pxFromDp(55));
+        mPanicButtonLandscape.animate().setInterpolator(new AccelerateInterpolator()).setDuration(170).translationXBy(helperMethod.pxFromDp(55));
+        mPanicButton.animate().setDuration(170).setInterpolator(new AccelerateInterpolator()).translationXBy(helperMethod.pxFromDp(55));
     }
 
     private void initSplashScreen(){
@@ -776,7 +775,7 @@ class homeViewController
 
     /*-------------------------------------------------------Helper Methods-------------------------------------------------------*/
 
-    void onOpenMenu(View view, boolean canGoForward, boolean isLoading, int userAgent, String mURL){
+    void onOpenMenu(View view, boolean canGoForward, boolean isLoading, int userAgent, String mURL, boolean pIsBookmarked){
 
         if(popupWindow!=null){
             popupWindow.dismiss();
@@ -811,6 +810,7 @@ class homeViewController
             popupWindow.showAtLocation(parent, Gravity.TOP|Gravity.END,0,0);
         }
 
+        ImageButton bookmark = popupView.findViewById(R.id.menu23);
         ImageButton back = popupView.findViewById(R.id.menu22);
         ImageButton close = popupView.findViewById(R.id.menu20);
         ImageButton mRefresh = popupView.findViewById(R.id.menu21);
@@ -818,6 +818,15 @@ class homeViewController
         CheckBox desktop = popupView.findViewById(R.id.menu27);
         LinearLayout newTab = popupView.findViewById(R.id.menu11);
         desktop.setChecked(userAgent==USER_AGENT_MODE_DESKTOP);
+        if(pIsBookmarked){
+            try {
+                bookmark .setImageDrawable(helperMethod.getDrawableXML(mContext,R.xml.ic_baseline_bookmark_filled));
+                bookmark.setColorFilter(ContextCompat.getColor(mContext, R.color.cursor_blue), android.graphics.PorterDuff.Mode.MULTIPLY);
+                bookmark.setTag("mMarked");
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
 
         String mExtention = helperMethod.getMimeType(mURL, mContext);
         if(!mURL.startsWith("data") && !mURL.startsWith("blob") && (mExtention == null || mExtention.equals("application/x-msdos-program") || mExtention.equals("text/html") || mExtention.equals("application/vnd.ms-htmlhelp") || mExtention.equals("application/vnd.sun.xml.writer") || mExtention.equals("application/vnd.sun.xml.writer.global") || mExtention.equals("application/vnd.sun.xml.writer.template") || mExtention.equals("application/xhtml+xml"))){
@@ -928,13 +937,19 @@ class homeViewController
                 mBannerAds.setVisibility(View.VISIBLE);
             }
             onSetBannerAdMargin(true,true);
-        } /* else if(mBannerAds.getVisibility() != View.VISIBLE){
+        } else if(mBannerAds.getVisibility() != View.VISIBLE){
             if(mBannerAds.getAlpha()==1){
                 mBannerAds.animate().cancel();
                 mBannerAds.animate().alpha(0).withEndAction(() -> mBannerAds.setVisibility(View.GONE));
             }
             onSetBannerAdMargin(false,true);
-        } */
+        }
+    }
+
+    void removeBanner(){
+        mBannerAds.setVisibility(View.GONE);
+        mWebviewContainer.setPadding(0,0,0,0);
+        onFullScreen(false);
     }
 
     private Handler searchBarUpdateHandler = new Handler();
@@ -973,7 +988,7 @@ class homeViewController
     {
         if(total==0){
             mFindCount.setText("0/0");
-            mFindCount.setTextColor(ContextCompat.getColor(mContext, R.color.dark_red_soft));
+            mFindCount.setTextColor(ContextCompat.getColor(mContext, R.color.c_error_text_color));
         }else {
             mFindCount.setText((total + "/" + index));
             mFindCount.setTextColor(ContextCompat.getColor(mContext, R.color.c_text_v6));
@@ -1229,6 +1244,7 @@ class homeViewController
     public void onFirstPaint(){
         onFullScreen(true);
         mGeckoView.setForeground(ContextCompat.getDrawable(mContext, R.color.clear_alpha));
+        onResetTabAnimation();
     }
 
     public void onSessionReinit(){
@@ -1254,6 +1270,10 @@ class homeViewController
             return;
         }
 
+        if(mSearchbar.getText().toString().equals("genesis.onion")){
+            return;
+        }
+
         mProgressBar.setVisibility(View.VISIBLE);
         mProgressBar.setAlpha(1);
         mProgressBar.animate().cancel();
@@ -1287,6 +1307,10 @@ class homeViewController
         mGeckoView.setPivotX(0);
         mGeckoView.setPivotY(0);
 
+        if(mGeckoView.getAlpha()<1 || mGeckoView.getTranslationX()<0){
+            return;
+        }
+
         ObjectAnimator scaleDown = ObjectAnimator.ofPropertyValuesHolder(mGeckoView,
                 PropertyValuesHolder.ofFloat("translationX", 0, helperMethod.pxFromDp(-50)));
         mNewTabBlocker.setVisibility(View.VISIBLE);
@@ -1307,15 +1331,6 @@ class homeViewController
             @Override
             public void onAnimationEnd(Animator animation, boolean isReverse) {
                 mEvent.invokeObserver(data, e_type);
-                ObjectAnimator scaleDown = ObjectAnimator.ofPropertyValuesHolder(mGeckoView,
-                        PropertyValuesHolder.ofFloat("translationX", 0, 0));
-
-                scaleDown.setDuration(150);
-                scaleDown.setStartDelay(0);
-                mNewTabBlocker.animate().setStartDelay(250).setDuration(150).alpha(0f).withEndAction(() -> {
-                    mNewTabBlocker.setVisibility(View.GONE);
-                });
-                scaleDown.start();
             }
 
             @Override
@@ -1324,17 +1339,6 @@ class homeViewController
 
             @Override
             public void onAnimationEnd(Animator animation) {
-                mEvent.invokeObserver(data, e_type);
-                ObjectAnimator scaleDown = ObjectAnimator.ofPropertyValuesHolder(mGeckoView,
-                        PropertyValuesHolder.ofFloat("scaleX", 0.8f, 1f),
-                        PropertyValuesHolder.ofFloat("scaleY", 0.8f, 1f));
-
-                scaleDown.setDuration(150);
-                scaleDown.setStartDelay(0);
-                mNewTabBlocker.animate().setStartDelay(250).setDuration(150).alpha(0f).withEndAction(() -> {
-                    mNewTabBlocker.setVisibility(View.GONE);
-                });
-                scaleDown.start();
             }
 
             @Override
@@ -1348,6 +1352,20 @@ class homeViewController
         });
     }
 
+    public void onResetTabAnimation(){
+        mGeckoView.setPivotX(0);
+        mGeckoView.setPivotY(0);
+
+        ObjectAnimator scaleDown = ObjectAnimator.ofPropertyValuesHolder(mGeckoView, PropertyValuesHolder.ofFloat("translationX", 0, helperMethod.pxFromDp(0)));
+
+        scaleDown.setDuration(0);
+        scaleDown.setStartDelay(0);
+        mNewTabBlocker.animate().setStartDelay(250).setDuration(250).alpha(0f).withEndAction(() -> {
+            mNewTabBlocker.setVisibility(View.GONE);
+        });
+        scaleDown.start();
+    }
+
     void onClearSelections(boolean hideKeyboard){
         mSearchbar.setFocusable(false);
         mSearchbar.setFocusableInTouchMode(true);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java
index 590a3116..6b547a90 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/clearManager/settingClearController.java
@@ -105,28 +105,34 @@ public class settingClearController extends AppCompatActivity {
 
     public void onClearData(View view){
         boolean mHomeInvoked = false;
+        boolean mClearInvoked = false;
+
         if(mCheckBoxList.get(0).isChecked()){
             mCheckBoxList.get(0).setChecked(false);
             mCheckBoxList.get(0).setButtonTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.c_checkbox_tint_default)));
             dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_CLEAR_TAB, null);
             mHomeInvoked = true;
+            mClearInvoked = true;
         }
         if(mCheckBoxList.get(1).isChecked()){
             mCheckBoxList.get(1).setChecked(false);
             mCheckBoxList.get(1).setButtonTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.c_checkbox_tint_default)));
             dataController.getInstance().invokeSQLCipher(dataEnums.eSqlCipherCommands.M_EXEC_SQL, Arrays.asList(SQL_CLEAR_HISTORY,null));
             dataController.getInstance().invokeHistory(dataEnums.eHistoryCommands.M_CLEAR_HISTORY ,null);
+            mClearInvoked = true;
         }
         if(mCheckBoxList.get(2).isChecked()){
             mCheckBoxList.get(2).setChecked(false);
             mCheckBoxList.get(2).setButtonTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.c_checkbox_tint_default)));
             dataController.getInstance().invokeSQLCipher(dataEnums.eSqlCipherCommands.M_EXEC_SQL, Arrays.asList(SQL_CLEAR_BOOKMARK,null));
             dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_CLEAR_BOOKMARK ,null);
+            mClearInvoked = true;
         }
         if(mCheckBoxList.get(3).isChecked()){
             mCheckBoxList.get(3).setChecked(false);
             mCheckBoxList.get(3).setButtonTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.c_checkbox_tint_default)));
             activityContextManager.getInstance().getHomeController().onClearCache();
+            mClearInvoked = true;
         }
         if(mCheckBoxList.get(4).isChecked()){
             mCheckBoxList.get(4).setChecked(false);
@@ -134,6 +140,7 @@ public class settingClearController extends AppCompatActivity {
             mCheckBoxList.get(4).setButtonTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.c_checkbox_tint_default)));
             activityContextManager.getInstance().getHomeController().onClearSiteData();
             mHomeInvoked = true;
+            mClearInvoked = true;
         }
         if(mCheckBoxList.get(5).isChecked()){
             dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_CLEAR_TAB, null);
@@ -141,11 +148,13 @@ public class settingClearController extends AppCompatActivity {
             mCheckBoxList.get(5).setButtonTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.c_checkbox_tint_default)));
             activityContextManager.getInstance().getHomeController().onClearSession();
             mHomeInvoked = true;
+            mClearInvoked = true;
         }
         if(mCheckBoxList.get(6).isChecked()){
             mCheckBoxList.get(6).setChecked(false);
             mCheckBoxList.get(6).setButtonTintList(ColorStateList.valueOf(ContextCompat.getColor(this, R.color.c_checkbox_tint_default)));
             activityContextManager.getInstance().getHomeController().onClearCookies();
+            mClearInvoked = true;
         }
         if(mCheckBoxList.get(7).isChecked()){
             mCheckBoxList.get(7).setChecked(false);
@@ -154,16 +163,18 @@ public class settingClearController extends AppCompatActivity {
             status.initStatus(activityContextManager.getInstance().getHomeController());
             dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_CLEAR_TAB, null);
             mHomeInvoked = true;
+            mClearInvoked = true;
         }
 
-        activityContextManager.getInstance().getHomeController().initRuntimeSettings();
-        pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_DATA_CLEARED);
+        if(mClearInvoked){
+            activityContextManager.getInstance().getHomeController().initRuntimeSettings();
+            pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_DATA_CLEARED);
 
-        if(mHomeInvoked){
-            activityContextManager.getInstance().getHomeController().onClearSettings();
+            if(mHomeInvoked){
+                activityContextManager.getInstance().getHomeController().onClearSettings();
+            }
         }
 
-
     }
 
     private void onClearSettings(){
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
index ddcb88cd..3233698d 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
@@ -1,8 +1,6 @@
 package com.darkweb.genesissearchengine.appManager.tabManager;
 
-import android.animation.Animator;
 import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
@@ -103,46 +101,10 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
     }
 
     public void scaleView(View v, tabRowModel mTabRowModel) {
-        v.bringToFront();
-        ObjectAnimator scaleDown = ObjectAnimator.ofPropertyValuesHolder(v,
-                PropertyValuesHolder.ofFloat("scaleX", 1, 1f),
-                PropertyValuesHolder.ofFloat("scaleY", 1, 1f));
-        scaleDown.setDuration(0);
-        scaleDown.start();
-        v.setClickable(false);
-        v.setFocusable(false);
-        v.setEnabled(false);
 
         mEvent.invokeObserver(Arrays.asList(mTabRowModel.getSession(), false), tabEnums.eTabAdapterCallback.ON_LOAD_TAB);
         onTriggerURL(mTabRowModel);
 
-        scaleDown.addListener(new Animator.AnimatorListener() {
-            @Override
-            public void onAnimationStart(Animator animation, boolean isReverse) {
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation, boolean isReverse) {
-            }
-
-            @Override
-            public void onAnimationStart(Animator animation) {
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-
-            }
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-            }
-        });
-
     }
 
     @Override
@@ -439,7 +401,7 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
                     if(status.sTheme == enums.Theme.THEME_DARK || status.sDefaultNightMode){
                         mCardView.setCardBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_button_text_v1_inverted));
                     }else {
-                        mCardView.setCardBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.text_color_highlight_v3));
+                        mCardView.setCardBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_text_color_highlight_v2));
                     }
                 }else {
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
index 6fe0b31c..a00826da 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
@@ -44,7 +44,6 @@ import java.util.List;
 import java.util.Objects;
 
 import static com.darkweb.genesissearchengine.appManager.tabManager.tabEnums.eTabViewCommands.ON_HIDE_UNDO_DIALOG_FORCED;
-import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_LOAD_NEW_TAB;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_RESET;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_UNDO;
 import static org.mozilla.gecko.util.ThreadUtils.runOnUiThread;
@@ -193,7 +192,7 @@ public class tabController extends Fragment
     public void initializeViews(){
         mRecycleView = mRootView.findViewById(R.id.pRecycleView);
         mTabs = mRootView.findViewById(R.id.pTabs);
-        mEmptyView = mRootView.findViewById(R.id.pEmptyView);
+        mEmptyView = mRootView.findViewById(R.id.pURL);
         mRemoveSelection = mRootView.findViewById(R.id.pRemoveSelection);
         mMenuButton = mRootView.findViewById(R.id.pMenuButton);
         mClearSelection = mRootView.findViewById(R.id.pClearSelection);
@@ -235,7 +234,7 @@ public class tabController extends Fragment
             float scrollY = mNestedScrollView.getScrollY();
 
             minScroll = scrollY;
-            int orientation = this.getResources().getConfiguration().orientation;
+            int orientation = mContextManager.getHomeController().getResources().getConfiguration().orientation;
             if (orientation == Configuration.ORIENTATION_PORTRAIT) {
                 maxScroll = mRecycleView.computeVerticalScrollRange() - mScreenHeight*0.350f + helperMethod.pxFromDp(helperMethod.getNavigationBarSize(getContext()).y);
             } else {
@@ -512,21 +511,17 @@ public class tabController extends Fragment
         if(mSelectionSize >= mListModel.getList().size()){
             mRecycleView.animate().setDuration(200).alpha(0).withEndAction(() -> {
                 mTabAdapter.onTrigger(tabEnums.eTabAdapterCommands.M_REMOVE_ALL_SELECTION, null);
-                //onShowUndoDialog();
-                onClearSelection(null);
             });
         }else {
             mTabAdapter.onTrigger(tabEnums.eTabAdapterCommands.M_REMOVE_ALL_SELECTION, null);
         }
 
-        mtabViewController.onTrigger(tabEnums.eTabViewCommands.ON_SHOW_SELECTION_MENU, Arrays.asList(false,0));
         mtabViewController.onTrigger(tabEnums.eTabViewCommands.ON_HIDE_SELECTION, null);
-        new Handler().postDelayed(() -> {
-            activityContextManager.getInstance().getHomeController().onLoadTabFromTabController();
-        }, 500);
 
-        // mTabAdapter.notifyDataSetChanged();
+
         initTabCount(400);
+        onClearSelection(null);
+        onShowUndoDialog();
 
     }
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
index da9b48df..5ef305d9 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
@@ -2,6 +2,10 @@ package com.darkweb.genesissearchengine.constants;
 
 public class keys
 {
+    /*GENERIC*/
+
+    public static final String M_ACTIVITY_RESPONSE = "M_ACTIVITY_RESPONSE";
+
     /*Home page*/
 
     public static String HOME_LOW_MEMORY = "LOW_MEMORY";
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/responses.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/responses.java
new file mode 100644
index 00000000..97ca1df3
--- /dev/null
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/responses.java
@@ -0,0 +1,10 @@
+package com.darkweb.genesissearchengine.constants;
+
+public class responses
+{
+    /*Notification Manager Manager*/
+    public static final String BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT = "BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT";
+    public static final String BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT = "BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT";
+
+}
+
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java b/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java
index f4e94df6..480279dd 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java
@@ -66,8 +66,7 @@ public class strings
 
     /*Bookmark Setting Manager*/
 
-    public static final String BOOKMARK_SETTING_VALIDATION_ERROR_1 = "➔ bookmark name empty";
-    public static final String BOOKMARK_SETTING_VALIDATION_ERROR_2 = "➔ bookmark url empty";
+    public static final String BOOKMARK_SETTING_VALIDATION_ERROR_2 = "bookmark url empty";
 
 }
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/bookmarkDataModel.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/bookmarkDataModel.java
index d57a6b8b..350aefe6 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/bookmarkDataModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/bookmarkDataModel.java
@@ -1,11 +1,16 @@
 package com.darkweb.genesissearchengine.dataManager;
 
+import android.content.Intent;
+import android.util.Log;
+
+import com.darkweb.genesissearchengine.constants.keys;
 import com.darkweb.genesissearchengine.dataManager.models.bookmarkRowModel;
 import com.darkweb.genesissearchengine.constants.constants;
 import com.darkweb.genesissearchengine.constants.strings;
 import com.darkweb.genesissearchengine.eventObserver;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 public class bookmarkDataModel {
@@ -14,6 +19,7 @@ public class bookmarkDataModel {
 
     private eventObserver.eventListener mExternalEvents;
     private ArrayList<bookmarkRowModel> mBookmarks;
+    private HashMap<String, Integer> mAvailableBookmark = new HashMap<>();
 
     /* Initializations */
 
@@ -24,6 +30,13 @@ public class bookmarkDataModel {
 
     void initializebookmark(ArrayList<bookmarkRowModel> pBookmark){
         mBookmarks = pBookmark;
+        for(int mCounter=0; mCounter<pBookmark.size();mCounter++){
+            if(mAvailableBookmark.containsKey(pBookmark.get(mCounter).getDescription())){
+                deleteBookmark(pBookmark.get(mCounter).getID());
+            }else {
+                mAvailableBookmark.put(pBookmark.get(mCounter).getDescription(), pBookmark.get(mCounter).getID());
+            }
+        }
     }
 
     /* Helper Methods */
@@ -62,10 +75,12 @@ public class bookmarkDataModel {
             mExternalEvents.invokeObserver(Arrays.asList("REPLACE INTO bookmark(id,title,url) VALUES("+autoval+",?,?);",params), dataEnums.eBookmarkCallbackCommands.M_EXEC_SQL);
         }
         mBookmarks.add(0,new bookmarkRowModel(pTitle, pURL,autoval));
+        mAvailableBookmark.put(pURL, autoval);
     }
 
     void clearBookmark(){
         mBookmarks.clear();
+        mAvailableBookmark.clear();
     }
 
     void updateBookmark(String pBookmarkName, String pBookmarkURL, int pBookmarkID){
@@ -73,6 +88,7 @@ public class bookmarkDataModel {
             if(mBookmarks.get(mCounter).getID()==pBookmarkID){
                 mBookmarks.get(mCounter).setHeader(pBookmarkName);
                 mBookmarks.get(mCounter).setURL(pBookmarkURL);
+                mAvailableBookmark.put(pBookmarkURL, pBookmarkID);
             }
         }
 
@@ -87,13 +103,33 @@ public class bookmarkDataModel {
     void deleteBookmark(int pID) {
         for(int mCounter=0;mCounter<mBookmarks.size();mCounter++){
             if(mBookmarks.get(mCounter).getID()==pID){
+                mAvailableBookmark.remove(mBookmarks.get(mCounter).getDescription());
                 mBookmarks.remove(mCounter);
+                Log.i("akldsjjkldsa","akldsjjkldsa : " + pID);
             }
         }
 
         mExternalEvents.invokeObserver(Arrays.asList("delete from bookmark where id="+ pID,null), dataEnums.eBookmarkCallbackCommands.M_EXEC_SQL);
     }
 
+    boolean isURLBookmarked(String pURL){
+        return mAvailableBookmark.containsKey(pURL);
+    }
+
+    Intent getBookmarkedIntent(Intent intent, String pURL){
+
+        for(int mCounter=0; mCounter<mBookmarks.size();mCounter++){
+            if(mBookmarks.get(mCounter).getID() == mAvailableBookmark.get(pURL)){
+                bookmarkRowModel mBookmarkRowModel = mBookmarks.get(mCounter);
+                intent.putExtra(keys.BOOKMARK_SETTING_NAME, mBookmarkRowModel.getHeader());
+                intent.putExtra(keys.BOOKMARK_SETTING_URL, mBookmarkRowModel.getDescription());
+                intent.putExtra(keys.BOOKMARK_SETTING_ID, mBookmarkRowModel.getID());
+                return intent;
+            }
+        }
+        return null;
+    }
+
     /* External Triggers */
 
     public Object onTrigger(dataEnums.eBookmarkCommands pCommands, List<Object> pData){
@@ -103,6 +139,9 @@ public class bookmarkDataModel {
         else if(pCommands == dataEnums.eBookmarkCommands.M_ADD_BOOKMARK){
             addBookmark((String)pData.get(0), (String)pData.get(1));
         }
+        else if(pCommands == dataEnums.eBookmarkCommands.M_DELETE_BOOKMARK_FROM_MENU){
+            deleteBookmark(mAvailableBookmark.get((String)pData.get(0)));
+        }
         else if(pCommands == dataEnums.eBookmarkCommands.M_DELETE_BOOKMARK){
             deleteBookmark((int)pData.get(0));
         }
@@ -112,7 +151,12 @@ public class bookmarkDataModel {
         else if(pCommands == dataEnums.eBookmarkCommands.M_UPDATE_BOOKMARK){
             updateBookmark((String) pData.get(0),(String) pData.get(1),(int) pData.get(2));
         }
-
+        else if(pCommands == dataEnums.eBookmarkCommands.M_BOOKMARK_AVAILABLE){
+            return isURLBookmarked((String) pData.get(0));
+        }
+        else if(pCommands == dataEnums.eBookmarkCommands.M_INTENT_BOOKMARK){
+            return getBookmarkedIntent((Intent) pData.get(0), (String) pData.get(1));
+        }
         return null;
     }
 
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java
index 89a10f66..7e7eff54 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/dataEnums.java
@@ -13,7 +13,7 @@ public class dataEnums
     }
 
     public enum eBookmarkCommands {
-        M_ADD_BOOKMARK, M_GET_BOOKMARK, M_DELETE_BOOKMARK, M_CLEAR_BOOKMARK, M_UPDATE_BOOKMARK;
+        M_ADD_BOOKMARK, M_GET_BOOKMARK, M_DELETE_BOOKMARK, M_DELETE_BOOKMARK_FROM_MENU,M_CLEAR_BOOKMARK, M_UPDATE_BOOKMARK, M_BOOKMARK_AVAILABLE, M_INTENT_BOOKMARK;
     }
 
     public enum eReferenceWebsiteCommands {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/tabDataModel.java b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/tabDataModel.java
index 04251c27..90907748 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/dataManager/tabDataModel.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/dataManager/tabDataModel.java
@@ -23,8 +23,10 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import static java.lang.Thread.sleep;
 
@@ -272,17 +274,19 @@ class tabDataModel
                         Bitmap mBitmap = pBitmapManager.poll(10000);
 
                         ByteArrayOutputStream out = new ByteArrayOutputStream();
-                        mBitmap.compress(Bitmap.CompressFormat.JPEG, 40, out);
-                        mTabs.get(finalCounter).decodeByteArraysetmBitmap(mBitmap);
+                        mBitmap.compress(Bitmap.CompressFormat.JPEG, 35, out);
 
                         Bitmap decoded = BitmapFactory.decodeStream(new ByteArrayInputStream(out.toByteArray()));
                         Bitmap emptyBitmap = Bitmap.createBitmap(decoded.getWidth(), decoded.getHeight(), decoded.getConfig());
                         if (!decoded.sameAs(emptyBitmap)) {
 
                             if(pImageView!=null){
-                                activityContextManager.getInstance().getHomeController().runOnUiThread(() -> pImageView.setImageBitmap(mBitmap));
+                                activityContextManager.getInstance().getHomeController().runOnUiThread(() -> {
+                                    pImageView.setImageBitmap(mBitmap);
+                                });
                             }
 
+                            mTabs.get(finalCounter).decodeByteArraysetmBitmap(decoded);
                             ContentValues mContentValues = new  ContentValues();
                             mContentValues.put("mThumbnail", out.toByteArray());
                             mExternalEvents.invokeObserver(Arrays.asList("tab",mContentValues, "mid = ?", new String[]{mTabs.get(finalCounter).getmId()}), dataEnums.eTabCallbackCommands.M_EXEC_SQL_USING_CONTENT);
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/adManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/adManager.java
index face6c6d..b3e95997 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/adManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/adPluginManager/adManager.java
@@ -1,20 +1,20 @@
 package com.darkweb.genesissearchengine.pluginManager.adPluginManager;
 
+import android.content.Context;
 import android.os.Handler;
 import android.util.Log;
-import android.view.View;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.darkweb.genesissearchengine.dataManager.dataController;
-import com.darkweb.genesissearchengine.dataManager.dataEnums;
 import com.darkweb.genesissearchengine.eventObserver;
 import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
-import com.google.android.gms.ads.*;
+import com.mopub.common.MoPub;
+import com.mopub.common.SdkConfiguration;
+import com.mopub.common.SdkInitializationListener;
+import com.mopub.mobileads.MoPubErrorCode;
+import com.mopub.mobileads.MoPubView;
 import java.lang.ref.WeakReference;
-import java.util.Arrays;
 import java.util.List;
+import static com.mopub.common.logging.MoPubLog.LogLevel.INFO;
 
 public class adManager
 {
@@ -22,41 +22,45 @@ public class adManager
     /*Private Variables */
 
     private eventObserver.eventListener mEvent;
-    private WeakReference<AdView> mBannerAds;
-    private boolean mPaidStatus;
-    private int mRequestCount = 0;
+    private WeakReference<MoPubView> mBannerAds;
 
+    private int mRequestCount = 0;
+    private boolean mPaidStatus;
     private boolean bannerAdsLoading = false;
     private boolean bannerAdsLoaded = false;
 
     /*Initializations*/
 
-    public adManager(eventObserver.eventListener pEvent, AdView pBannerAds, boolean pPaidStatus) {
+    public adManager(eventObserver.eventListener pEvent, MoPubView pBannerAds, boolean pPaidStatus,Context pContext) {
         this.mEvent = pEvent;
         this.mPaidStatus = pPaidStatus;
         this.mBannerAds = new WeakReference(pBannerAds);
+        initializeBannerAds(pContext);
     }
 
-    private void initializeBannerAds(){
+    private void initializeBannerAds(Context pContext){
         if(!mPaidStatus){
-            AdRequest request = new AdRequest.Builder().build();
-            mBannerAds.get().loadAd(request);
+            final SdkConfiguration.Builder configBuilder = new SdkConfiguration.Builder("c122efbe224f46678800d2f73389d258");
+            configBuilder.withLogLevel(INFO);
+            MoPub.initializeSdk(pContext, configBuilder.build(), initSdkListener());
             admobListeners();
         }
     }
 
+    private SdkInitializationListener initSdkListener() {
+        return () -> {
+        };
+    }
     /*Local Helper Methods*/
 
-    private void loadAds(AppCompatActivity pAppContext){
+    private void loadAds(){
         if(!mPaidStatus)
         {
             if (!bannerAdsLoading)
             {
                 bannerAdsLoading = true;
-                MobileAds.initialize(pAppContext.getApplicationContext(), initializationStatus -> { });
-                RequestConfiguration configuration = new RequestConfiguration.Builder().setTestDeviceIds(Arrays.asList("B1CF10D1F74698381CFF7BF9C485085B","D38EB6293679BC1D68FBDAC55A73DBA0")).build();
-                MobileAds.setRequestConfiguration(configuration);
-                initializeBannerAds();
+                mBannerAds.get().setAdUnitId("c122efbe224f46678800d2f73389d258");
+                mBannerAds.get().loadAd();
             }
         }
     }
@@ -69,35 +73,39 @@ public class adManager
 
     private void admobListeners(){
         if(!mPaidStatus){
-            mBannerAds.get().setAdListener(new AdListener() {
+            mBannerAds.get().setBannerAdListener(new MoPubView.BannerAdListener() {
                 @Override
-                public void onAdLoaded() {
+                public void onBannerLoaded(@NonNull MoPubView moPubView) {
                     bannerAdsLoaded = true;
                 }
 
                 @Override
-                public void onAdOpened() {
-                }
+                public void onBannerFailed(MoPubView moPubView, MoPubErrorCode moPubErrorCode) {
 
-                @Override
-                public void onAdClicked() {
-                }
-
-                @Override
-                public void onAdClosed() {
-                }
-
-                @Override
-                public void onAdFailedToLoad(@NonNull LoadAdError var1) {
                     new Handler().postDelayed(() ->
                     {
-                        if(mRequestCount<2){
+                        if(mRequestCount<10){
                             mRequestCount+=1;
-                            initializeBannerAds();
+                            mBannerAds.get().loadAd();
                         }
 
                     }, 30000);
                 }
+
+                @Override
+                public void onBannerClicked(MoPubView moPubView) {
+                    Log.i("asd","asd");
+                }
+
+                @Override
+                public void onBannerExpanded(MoPubView moPubView) {
+                    Log.i("asd","asd");
+                }
+
+                @Override
+                public void onBannerCollapsed(MoPubView moPubView) {
+                    Log.i("asd","asd");
+                }
             });
         }
     }
@@ -107,7 +115,7 @@ public class adManager
     public Object onTrigger(List<Object> pData, pluginEnums.eAdManager pEventType) {
         if(pEventType.equals(pluginEnums.eAdManager.M_INITIALIZE_BANNER_ADS))
         {
-            loadAds((AppCompatActivity)pData.get(0));
+            loadAds();
         }
         else if(pEventType.equals(pluginEnums.eAdManager.M_IS_ADVERT_LOADED))
         {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/downloadPluginManager/downloadReciever.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/downloadPluginManager/downloadReciever.java
index 08e16ca6..c95c1109 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/downloadPluginManager/downloadReciever.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/downloadPluginManager/downloadReciever.java
@@ -126,7 +126,6 @@ public class downloadReciever extends AsyncTask<String, Integer, String> {
             channel.setLightColor(Color.BLUE);
             channel.enableVibration(false);
             mNotifyManager.createNotificationChannel(channel);
-
         }
         build.setProgress(100, 0, false);
         mNotifyManager.notify(mID, build.build());
@@ -205,7 +204,6 @@ public class downloadReciever extends AsyncTask<String, Integer, String> {
                 mStream.close();
 
             } catch (Exception ex) {
-                Log.i("FIZZAHFUCK", ex.getMessage());
                 if(mRequestCode!=200){
                     mEvent.invokeObserver(Collections.singletonList(mRequestCode), M_DOWNLOAD_FAILURE);
                     onCancel();
@@ -227,8 +225,6 @@ public class downloadReciever extends AsyncTask<String, Integer, String> {
                 HttpGet httpget = new HttpGet(urlEncoded);
                 HttpResponse response = httpclient.execute(httpget);
 
-                StringBuilder sb = new StringBuilder();
-                sb.append(response.getStatusLine()).append("\n\n");
 
                 InputStream mStream = response.getEntity().getContent();
 
@@ -334,9 +330,7 @@ public class downloadReciever extends AsyncTask<String, Integer, String> {
             contentValues.put(MediaStore.Downloads.DISPLAY_NAME, mFileName);
             contentValues.put(MediaStore.Downloads.SIZE, mDownloadByte);
             contentValues.put(MediaStore.Downloads.MIME_TYPE, helperMethod.getMimeType(uri.toString(), context));
-
-            contentValues.put(MediaStore.Downloads.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS + File.separator + "Temp");
-
+            contentValues.put(MediaStore.Downloads.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS + File.separator + mFileName + "_" + helperMethod.createRandomID().substring(0,5));
             ContentResolver database = context.getContentResolver();
             database.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues);
         } else {
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java
index 2a5c57e4..55e46b1b 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java
@@ -14,11 +14,13 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.RatingBar;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import com.darkweb.genesissearchengine.constants.constants;
+
+import com.darkweb.genesissearchengine.constants.enums;
 import com.darkweb.genesissearchengine.constants.strings;
 import com.darkweb.genesissearchengine.eventObserver;
 import com.darkweb.genesissearchengine.helperManager.helperMethod;
@@ -26,7 +28,7 @@ import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
 import com.example.myapplication.R;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mozilla.geckoview.ContentBlocking;
-import java.util.ArrayList;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -92,52 +94,18 @@ public class messageManager
     }
 
     /*Helper Methods*/
-    private void welcomeMessage()
-    {
-        initializeDialog(R.layout.popup_welcome, Gravity.CENTER);
-        mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
-            mEvent.invokeObserver(Collections.singletonList(constants.CONST_BLACK_MARKET_URL), M_OPEN_LINK_CURRENT_TAB);
-            mDialog.dismiss();
-        });
-        mDialog.findViewById(R.id.pOption2).setOnClickListener(v -> {
-            mEvent.invokeObserver(Collections.singletonList(constants.CONST_LEAKED_DOCUMENT_URL), M_OPEN_LINK_CURRENT_TAB);
-            mDialog.dismiss();
-        });
-        mDialog.findViewById(R.id.pOption3).setOnClickListener(v -> {
-            mEvent.invokeObserver(Collections.singletonList(constants.CONST_NEWS_URL), M_OPEN_LINK_CURRENT_TAB);
-            mDialog.dismiss();
-        });
-        mDialog.findViewById(R.id.pOption4).setOnClickListener(v -> {
-            mEvent.invokeObserver(Collections.singletonList(constants.CONST_SOFTWARE_URL), M_OPEN_LINK_CURRENT_TAB);
-            mDialog.dismiss();
-        });
-        mDialog.findViewById(R.id.pOption5).setOnClickListener(v -> {
-            mEvent.invokeObserver(Collections.singletonList(constants.CONST_SOFTWARE_FINANCE), M_OPEN_LINK_CURRENT_TAB);
-            mDialog.dismiss();
-        });
-        mDialog.findViewById(R.id.pOption6).setOnClickListener(v -> {
-            mEvent.invokeObserver(Collections.singletonList(constants.CONST_COMMUNITIES), M_OPEN_LINK_CURRENT_TAB);
-            mDialog.dismiss();
-        });
-        mDialog.findViewById(R.id.pDontShowAgain).setOnClickListener(v -> {
-            mEvent.invokeObserver(null, M_CANCEL_WELCOME);
-            mDialog.dismiss();
-        });
-
-        mDialog.setOnDismissListener(dialog -> onClearReference());
-    }
 
     private void languageSupportFailure()
     {
         initializeDialog(R.layout.popup_language_support, Gravity.CENTER);
-        ((TextView) mDialog.findViewById(R.id.pLanguage)).setText((mData.get(0).toString()));
+        // ((TextView) mDialog.findViewById(R.id.pLanguage)).setText((mData.get(0).toString()));
         mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
         mDialog.setOnDismissListener(dialog -> onClearReference());
     }
 
     private void rateFailure()
     {
-        initializeDialog(R.layout.popup_rate_failure, Gravity.CENTER);
+        initializeDialog(R.layout.popup_rate_failure, Gravity.BOTTOM);
         mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
         mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             mDialog.dismiss();
@@ -156,13 +124,6 @@ public class messageManager
         });
     }
 
-    private void reportedSuccessfully()
-    {
-        initializeDialog(R.layout.popup_reported_successfully, Gravity.BOTTOM);
-        mDialog.findViewById(R.id.pNext).setOnClickListener(v -> mDialog.dismiss());
-        mDialog.setOnDismissListener(dialog -> onClearReference());
-    }
-
     private void newIdentityCreated()
     {
         final Handler handler = new Handler();
@@ -267,6 +228,48 @@ public class messageManager
         handler.postDelayed(runnable, 1500);
     }
 
+    private void deleteBookmark()
+    {
+        final Handler handler = new Handler();
+        Runnable runnable = () -> mDialog.dismiss();
+
+        initializeDialog(R.layout.popup_remove_bookmark, Gravity.BOTTOM);
+        mDialog.getWindow().setDimAmount(0.3f);
+        mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> {
+            mEvent.invokeObserver(null, M_UNDO_TAB);
+            mDialog.dismiss();
+            handler.removeCallbacks(runnable);
+        });
+
+        mDialog.setOnDismissListener(dialog -> {
+            handler.removeCallbacks(runnable);
+            onClearReference();
+        });
+
+        handler.postDelayed(runnable, 1500);
+    }
+
+    private void updateBookmark()
+    {
+        final Handler handler = new Handler();
+        Runnable runnable = () -> mDialog.dismiss();
+
+        initializeDialog(R.layout.popup_update_bookmark, Gravity.BOTTOM);
+        mDialog.getWindow().setDimAmount(0.3f);
+        mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> {
+            mEvent.invokeObserver(null, M_UNDO_TAB);
+            mDialog.dismiss();
+            handler.removeCallbacks(runnable);
+        });
+
+        mDialog.setOnDismissListener(dialog -> {
+            handler.removeCallbacks(runnable);
+            onClearReference();
+        });
+
+        handler.postDelayed(runnable, 1500);
+    }
+
     private void maxTabReached()
     {
         final Handler handler = new Handler();
@@ -320,9 +323,10 @@ public class messageManager
         Runnable runnable = () -> mDialog.dismiss();
 
         initializeDialog(R.layout.popup_orbot_connecting, Gravity.BOTTOM);
-        mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> {
+        mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             mDialog.dismiss();
             handler.removeCallbacks(runnable);
+            mEvent.invokeObserver(null, M_OPEN_LOGS);
         });
 
         mDialog.setOnDismissListener(dialog -> {
@@ -330,15 +334,24 @@ public class messageManager
             onClearReference();
         });
 
-        handler.postDelayed(runnable, 3500);
+        handler.postDelayed(runnable, 5000);
 
     }
 
     private void dataClearedSuccessfully()
     {
+        final Handler handler = new Handler();
+        Runnable runnable = () -> mDialog.dismiss();
+
         initializeDialog(R.layout.popup_data_cleared, Gravity.BOTTOM);
         mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
-        mDialog.setOnDismissListener(dialog -> onClearReference());
+
+        mDialog.setOnDismissListener(dialog -> {
+            handler.removeCallbacks(runnable);
+            onClearReference();
+        });
+
+        handler.postDelayed(runnable, 1500);
     }
 
     private void applicationCrashed()
@@ -397,16 +410,23 @@ public class messageManager
             };
             handler.postDelayed(runnable, 50);
         });
+
+        String pURL = mData.get(0).toString().replace("genesis.onion","genesishiddentechnologies.com");
+        ((TextView)mDialog.findViewById(R.id.pURL)).setText(pURL);
+
         mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> {
             mDialog.dismiss();
             helperMethod.hideKeyboard(mContext);
         });
 
+
         mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             mDialog.dismiss();
             helperMethod.hideKeyboard(mContext);
-            mEvent.invokeObserver(Collections.singletonList(mData.get(0).toString().replace("genesis.onion","genesishiddentechnologies.com")+"split"+((EditText) mDialog.findViewById(R.id.pBridgeInput)).getText().toString()), M_BOOKMARK);
+            String mBookmarkName = ((EditText)mDialog.findViewById(R.id.pBookmarkNameInput)).getText().toString();
+            mEvent.invokeObserver(Arrays.asList(pURL, mBookmarkName), M_BOOKMARK);
         });
+
     }
 
     private void onUpdateBridges()
@@ -484,8 +504,7 @@ public class messageManager
 
     private void clearHistory()
     {
-        initializeDialog(R.layout.popup_clear_history, Gravity.CENTER);
-        mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
+        initializeDialog(R.layout.popup_clear_history, Gravity.BOTTOM);
         mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             mDialog.dismiss();
             mEvent.invokeObserver(null, M_CLEAR_HISTORY);
@@ -495,25 +514,10 @@ public class messageManager
 
     private void clearBookmark()
     {
-        initializeDialog(R.layout.popup_clear_bookmark, Gravity.CENTER);
-        mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
+        initializeDialog(R.layout.popup_clear_bookmark, Gravity.BOTTOM);
         mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
-            mDialog.dismiss();
             mEvent.invokeObserver(null, M_CLEAR_BOOKMARK);
-        });
-        mDialog.setOnDismissListener(dialog -> onClearReference());
-    }
-
-    private void reportURL()
-    {
-        initializeDialog(R.layout.popup_report_url, Gravity.CENTER);
-        ((TextView) mDialog.findViewById(R.id.pHeader)).setText(mData.get(0).toString());
-        mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
-        mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             mDialog.dismiss();
-            final Handler handler = new Handler();
-            Runnable runnable = () -> onTrigger(Arrays.asList(strings.GENERIC_EMPTY_STR, mContext),M_RATE_SUCCESS);
-            handler.postDelayed(runnable, 1000);
         });
         mDialog.setOnDismissListener(dialog -> onClearReference());
     }
@@ -521,17 +525,22 @@ public class messageManager
     private void downloadSingle()
     {
         if(mData.size()>0){
-            initializeDialog(R.layout.popup_download_url, Gravity.CENTER);
+            initializeDialog(R.layout.popup_download_url, Gravity.BOTTOM);
+            String murl = mData.get(2).toString();
+
+            if(!murl.startsWith("http")){
+                murl = "https://" + murl;
+            }
+
             ((TextView) mDialog.findViewById(R.id.pDescription)).setText(mData.get(0).toString());
+            ((TextView) mDialog.findViewById(R.id.pDescriptionLong)).setText(murl);
             mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
             mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
-                ArrayList<Object> tempData = new ArrayList<>();
-                if(mData!=null){
-                    tempData.addAll(mData);
-                }
                 mDialog.dismiss();
                 final Handler handler = new Handler();
-                Runnable runnable = () -> mEvent.invokeObserver(tempData, M_DOWNLOAD_SINGLE);
+                Runnable runnable = () -> {
+                    mEvent.invokeObserver(mData, M_DOWNLOAD_SINGLE);
+                };
                 handler.postDelayed(runnable, 1000);
                 onClearReference();
             });
@@ -579,6 +588,7 @@ public class messageManager
 
         initializeDialog(R.layout.popup_file_longpress, Gravity.CENTER);
         ((TextView) mDialog.findViewById(R.id.pDescription)).setText((title + mData.get(0).toString()));
+        mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(mData.get(0).toString())), enums.etype.fetch_favicon);
         mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
         mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
             if(mData!=null){
@@ -613,6 +623,7 @@ public class messageManager
 
         initializeDialog(R.layout.popup_url_longpress, Gravity.CENTER);
         ((TextView) mDialog.findViewById(R.id.pDescription)).setText((title + mData.get(0)));
+        mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(mData.get(0).toString())), enums.etype.fetch_favicon);
         mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
         mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
             if(mData!=null){
@@ -639,6 +650,9 @@ public class messageManager
         String url = mData.get(0).toString();
         String file = mData.get(2).toString();
         String title = mData.get(3).toString();
+        String altText = strings.GENERIC_EMPTY_STR;
+        String mDescription = strings.GENERIC_EMPTY_STR;
+        String mDescriptionShort = strings.GENERIC_EMPTY_STR;
 
         String data_local = mContext.getString(R.string.ALERT_LONG_URL_MESSAGE);
 
@@ -652,10 +666,19 @@ public class messageManager
         if(mTitle.length()<=1){
             mTitle = mData.get(0).toString();
         }
+        if(mData.get(5) != null){
+            mDescription = mData.get(5).toString();
+            mDescriptionShort = data_local;
+        }else {
+            mDescription = data_local;
+        }
+
 
         initializeDialog(R.layout.popup_download_full, Gravity.CENTER);
-        ((TextView) mDialog.findViewById(R.id.pHeader)).setText(mTitle);
-        ((TextView) mDialog.findViewById(R.id.pDescription)).setText((data_local));
+        mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(data_local)), enums.etype.fetch_favicon);
+
+        ((TextView) mDialog.findViewById(R.id.pDescription)).setText((mDescription));
+        ((TextView) mDialog.findViewById(R.id.pDescriptionShort)).setText((mDescriptionShort));
         mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
             if(mData!=null){
                 mEvent.invokeObserver(Collections.singletonList(url), M_OPEN_LINK_NEW_TAB);
@@ -703,7 +726,7 @@ public class messageManager
 
     private void sendBridgeMail()
     {
-        initializeDialog(R.layout.popup_bridge_mail, Gravity.CENTER);
+        initializeDialog(R.layout.popup_bridge_mail, Gravity.BOTTOM);
         mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
         mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
             mDialog.dismiss();
@@ -742,10 +765,6 @@ public class messageManager
             this.mData = pData;
 
             switch (pEventType) {
-                case M_WELCOME:
-                    /*VERIFIED*/
-                    welcomeMessage();
-                    break;
 
                 case M_RATE_FAILURE:
                     /*VERIFIED*/
@@ -757,11 +776,6 @@ public class messageManager
                     languageSupportFailure();
                     break;
 
-                case M_RATE_SUCCESS:
-                    /*VERIFIED*/
-                    reportedSuccessfully();
-                    break;
-
                 case M_BOOKMARK:
                     /*VERIFIED*/
                     bookmark();
@@ -777,14 +791,8 @@ public class messageManager
                     clearBookmark();
                     break;
 
-                case M_REPORT_URL:
-                    /*VERIFIED*/
-                    reportURL();
-                    break;
-
                 case M_RATE_APP:
                     /*VERIFIED*/
-                    //onClearReference();
                     rateApp();
                     break;
 
@@ -877,6 +885,16 @@ public class messageManager
                     /*VERIFIED*/
                     popupUndo();
                     break;
+
+                case M_DELETE_BOOKMARK:
+                    /*VERIFIED*/
+                    deleteBookmark();
+                    break;
+
+                case M_UPDATE_BOOKMARK:
+                    /*VERIFIED*/
+                    updateBookmark();
+                    break;
             }
         }
     }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
index 8914f49a..b38b4804 100755
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
@@ -1,10 +1,12 @@
 package com.darkweb.genesissearchengine.pluginManager;
 
 import android.os.Handler;
+import android.widget.ImageView;
 
 import androidx.appcompat.app.AppCompatActivity;
 import com.darkweb.genesissearchengine.appManager.activityContextManager;
 import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
+import com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogController;
 import com.darkweb.genesissearchengine.appManager.settingManager.privacyManager.settingPrivacyController;
 import com.darkweb.genesissearchengine.constants.constants;
 import com.darkweb.genesissearchengine.constants.enums;
@@ -28,6 +30,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
+import static com.darkweb.genesissearchengine.constants.enums.etype.fetch_favicon;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eAdManagerCallbacks.M_SHOW_LOADED_ADS;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eLangManager.M_ACTIVITY_CREATED;
 import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eLangManager.M_RESUME;
@@ -80,7 +83,7 @@ public class pluginController
         mContextManager = activityContextManager.getInstance();
 
         mNotificationManager = new notifictionManager(mHomeController,new notificationCallback());
-        mAdManager = new adManager(new admobCallback(), ((homeController)mHomeController.get()).getBannerAd(), status.sPaidStatus);
+        mAdManager = new adManager(new admobCallback(), ((homeController)mHomeController.get()).getBannerAd(), status.sPaidStatus, mHomeController.get());
         mAnalyticsManager = new analyticManager(mHomeController,new analyticCallback(), status.sDeveloperBuild);
         mMessageManager = new messageManager(new messageCallback());
         mOrbotManager = orbotManager.getInstance();
@@ -262,11 +265,7 @@ public class pluginController
             }
             else if(pEventType.equals(M_BOOKMARK)){
                 String [] dataParser = pData.get(0).toString().split("split");
-                if(dataParser.length>1){
-                    dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_ADD_BOOKMARK ,Arrays.asList(dataParser[0],dataParser[1]));
-                }else {
-                    dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_ADD_BOOKMARK ,Arrays.asList(dataParser[0],""));
-                }
+                dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_ADD_BOOKMARK ,Arrays.asList(dataParser[0],pData.get(1).toString()));
             }
             else if(pEventType.equals(M_APP_RATED)){
                 dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.PROXY_IS_APP_RATED,true));
@@ -274,9 +273,15 @@ public class pluginController
             else if(pEventType.equals(M_CUSTOM_BRIDGE)){
                 return status.sBridgeCustomBridge;
             }
+            else if(pEventType.equals(M_OPEN_LOGS)){
+                helperMethod.openActivity(orbotLogController.class, constants.CONST_LIST_HISTORY, mHomeController.get(),true);
+            }
             else if(pEventType.equals(M_BRIDGE_TYPE)){
                 return status.sBridgeCustomType;
             }
+            else if(pEventType.equals(fetch_favicon)){
+                activityContextManager.getInstance().getHomeController().onGetFavIcon((ImageView) pData.get(0), (String) pData.get(1));
+            }
             else if(pEventType.equals(M_DOWNLOAD_FILE)){
                 ((homeController)mHomeController.get()).onDownloadFile();
             }
diff --git a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java
index d68c464d..3110d4d3 100644
--- a/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java
+++ b/app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java
@@ -28,7 +28,7 @@ public class pluginEnums
 
     /*Message Manager*/
     public enum eMessageManager{
-        M_RESET, M_DATA_CLEARED, M_APPLICATION_CRASH, M_SECURE_CONNECTION, M_POPUP_BLOCKED, M_PANIC, M_MAX_TAB_REACHED, M_ORBOT_LOADING, M_LOAD_NEW_TAB, M_UNDO,M_DOWNLOAD_SINGLE, M_UPDATE_BRIDGES, M_NEW_IDENTITY, M_NOT_SUPPORTED, M_BRIDGE_MAIL, M_LONG_PRESS_WITH_LINK, M_LONG_PRESS_URL, M_LONG_PRESS_DOWNLOAD, M_START_ORBOT, M_DOWNLOAD_FAILURE, M_DOWNLOAD_FILE, M_RATE_APP, M_REPORT_URL, M_CLEAR_BOOKMARK, M_CLEAR_HISTORY, M_BOOKMARK, M_PANIC_RESET, M_RATE_SUCCESS, M_RATE_FAILURE, M_LANGUAGE_SUPPORT_FAILURE, M_WELCOME
+        M_RESET, M_DATA_CLEARED, M_APPLICATION_CRASH, M_DELETE_BOOKMARK, M_UPDATE_BOOKMARK, M_SECURE_CONNECTION, M_POPUP_BLOCKED, M_PANIC, M_MAX_TAB_REACHED, M_ORBOT_LOADING, M_LOAD_NEW_TAB, M_UNDO,M_DOWNLOAD_SINGLE, M_UPDATE_BRIDGES, M_NEW_IDENTITY, M_NOT_SUPPORTED, M_BRIDGE_MAIL, M_LONG_PRESS_WITH_LINK, M_LONG_PRESS_URL, M_LONG_PRESS_DOWNLOAD, M_START_ORBOT, M_DOWNLOAD_FAILURE, M_DOWNLOAD_FILE, M_RATE_APP, M_REPORT_URL, M_CLEAR_BOOKMARK, M_CLEAR_HISTORY, M_BOOKMARK, M_PANIC_RESET, M_OPEN_LOGS, M_RATE_SUCCESS, M_RATE_FAILURE, M_LANGUAGE_SUPPORT_FAILURE, M_WELCOME
     }
     public enum eMessageManagerCallbacks{
         M_CANCEL_WELCOME, M_APP_RATED, M_DOWNLOAD_FILE_MANUAL, M_OPEN_LINK_CURRENT_TAB, M_COPY_LINK, M_REQUEST_BRIDGES, M_SET_BRIDGES, M_OPEN_LINK_NEW_TAB, M_CLEAR_TAB, M_RATE_APPLICATION, M_OPEN_PRIVACY, M_UNDO_SESSION, M_UNDO_TAB, M_CUSTOM_BRIDGE, M_BRIDGE_TYPE
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_background_inverted.xml b/app/src/main/res/custom-xml/alert/xml/ax_background_inverted.xml
index f7ad3d9a..f9a5fe5a 100644
--- a/app/src/main/res/custom-xml/alert/xml/ax_background_inverted.xml
+++ b/app/src/main/res/custom-xml/alert/xml/ax_background_inverted.xml
@@ -15,7 +15,11 @@
                     android:endColor="@color/c_background_inverted"
                     android:startColor="@color/c_background_inverted"
                     android:type="linear" />
-            <corners android:radius="5.5dp" />
+            <corners
+                android:bottomLeftRadius="8dp"
+                android:bottomRightRadius="8dp"
+                android:topLeftRadius="8dp"
+                android:topRightRadius="8dp"/>
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_border_left.xml b/app/src/main/res/custom-xml/alert/xml/ax_border_left.xml
new file mode 100644
index 00000000..2d961837
--- /dev/null
+++ b/app/src/main/res/custom-xml/alert/xml/ax_border_left.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:left="0dp" android:right="-5dp" android:top="-5dp" android:bottom="-15dp">
+        <shape
+            android:shape="rectangle">
+            <stroke android:width="4dp" android:color="@color/green_alert" />
+            <solid android:color="@color/c_background" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_bottom_rounded_corner_left.xml b/app/src/main/res/custom-xml/alert/xml/ax_bottom_rounded_corner_left.xml
index e0620e74..c69446c4 100644
--- a/app/src/main/res/custom-xml/alert/xml/ax_bottom_rounded_corner_left.xml
+++ b/app/src/main/res/custom-xml/alert/xml/ax_bottom_rounded_corner_left.xml
@@ -2,7 +2,7 @@
     android:color="@color/c_view_divier_background">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners
                 android:bottomLeftRadius="4dp"
                 android:bottomRightRadius="0dp"
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_bottom_rounded_corner_right.xml b/app/src/main/res/custom-xml/alert/xml/ax_bottom_rounded_corner_right.xml
index 94ce5f48..a3b942dd 100644
--- a/app/src/main/res/custom-xml/alert/xml/ax_bottom_rounded_corner_right.xml
+++ b/app/src/main/res/custom-xml/alert/xml/ax_bottom_rounded_corner_right.xml
@@ -2,7 +2,7 @@
     android:color="@color/c_ripple">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners
                 android:bottomLeftRadius="0dp"
                 android:bottomRightRadius="4dp"
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom.xml b/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom.xml
index 4e184e51..6a70b44b 100644
--- a/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom.xml
+++ b/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom.xml
@@ -1,13 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/c_ripple">
+    android:color="#0047b3">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/c_button_text_v2" />
-            <corners
-                android:bottomLeftRadius="4dp"
-                android:bottomRightRadius="4dp"
-                android:topLeftRadius="0dp"
-                android:topRightRadius="0dp"/>
+            <solid android:color="#0047b3" />
+            <corners android:radius="3.5dp" />
         </shape>
     </item>
-</ripple>
\ No newline at end of file
+
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="90"
+                android:endColor="@color/cursor_blue"
+                android:startColor="@color/cursor_blue"
+                android:type="linear" />
+            <corners android:radius="3.5dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom_secondary.xml b/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom_secondary.xml
new file mode 100644
index 00000000..bcaad82e
--- /dev/null
+++ b/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_bottom_secondary.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/green_alert_dark">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/green_alert_dark" />
+            <corners android:radius="3.5dp" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="90"
+                android:endColor="@color/secondary"
+                android:startColor="@color/secondary"
+                android:type="linear" />
+            <corners android:radius="3.5dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_left.xml b/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_left.xml
index 87afddf3..210021b7 100644
--- a/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_left.xml
+++ b/app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_left.xml
@@ -2,7 +2,7 @@
     android:color="@color/c_ripple">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners
                 android:bottomLeftRadius="4dp"
                 android:bottomRightRadius="0dp"
diff --git a/app/src/main/res/custom-xml/alert/xml/ax_round_corner.xml b/app/src/main/res/custom-xml/alert/xml/ax_round_corner.xml
new file mode 100644
index 00000000..1a5da3e9
--- /dev/null
+++ b/app/src/main/res/custom-xml/alert/xml/ax_round_corner.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Bottom 2dp Shadow -->
+    <item>
+        <shape  android:shape="rectangle">
+
+            <solid android:color="@color/cursor_blue" />
+            <corners android:radius="8dp" />
+
+        </shape>
+    </item>
+
+    <!-- White Top color -->
+    <item android:bottom="6dp" android:left="0px" android:right="0px" android:top="0px">
+
+        <shape  android:shape="rectangle">
+
+            <gradient
+                android:angle="90"
+                android:startColor="#e4e8f7"
+                android:endColor="@color/white"
+                android:type="linear" />
+            <corners android:radius="8dp" />
+
+
+        </shape>
+
+    </item>
+
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/bookmark/xml/bx_form_inactive.xml b/app/src/main/res/custom-xml/bookmark/xml/bx_form_inactive.xml
new file mode 100644
index 00000000..e0a93605
--- /dev/null
+++ b/app/src/main/res/custom-xml/bookmark/xml/bx_form_inactive.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <corners android:radius="4.5dp" />
+            <stroke android:width="1dip" android:color="@color/c_edittext_border"/>
+            <solid android:color="@color/c_edittext_background_form_inactive" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/custom-xml/bookmark/xml/bx_input_field.xml b/app/src/main/res/custom-xml/bookmark/xml/bx_input_field.xml
new file mode 100644
index 00000000..f48079be
--- /dev/null
+++ b/app/src/main/res/custom-xml/bookmark/xml/bx_input_field.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+          android:top="113dp">
+        <shape
+            android:shape="rectangle" android:padding="10dp" >
+            <solid android:color="@color/c_edittext_background_blue"/>
+            <corners android:radius="7dp"/>
+            <stroke android:width="2.5dp" android:color="@color/c_text_color_highlight_v2" />
+        </shape>
+    </item>
+    <item android:state_pressed="false"
+          android:top="113dp">
+        <shape
+            android:shape="rectangle" android:padding="10dp">
+            <solid android:color="@color/c_edittext_background_blue"/>
+            <corners android:radius="7dp"/>
+            <stroke android:width="2.5dp" android:color="@color/c_text_color_highlight_v2" />
+        </shape>
+    </item>
+</selector>
+
+
+
diff --git a/app/src/main/res/custom-xml/bookmark/xml/bx_input_field_error.xml b/app/src/main/res/custom-xml/bookmark/xml/bx_input_field_error.xml
new file mode 100644
index 00000000..a9b4e02e
--- /dev/null
+++ b/app/src/main/res/custom-xml/bookmark/xml/bx_input_field_error.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+          android:top="113dp">
+        <shape
+            android:shape="rectangle" android:padding="10dp" >
+            <solid android:color="@color/c_edittext_error_background"/>
+            <corners android:radius="7dp"/>
+            <stroke android:width="2dp" android:color="@color/c_edittext_error_border"/>
+        </shape>
+    </item>
+    <item android:state_pressed="false"
+          android:top="113dp">
+        <shape
+            android:shape="rectangle" android:padding="10dp">
+            <solid android:color="@color/c_edittext_error_background"/>
+            <corners android:radius="7dp"/>
+            <stroke android:width="2dp" android:color="@color/c_edittext_error_border"/>
+        </shape>
+    </item>
+</selector>
+
+
+
diff --git a/app/src/main/res/custom-xml/bookmark/xml/bx_popup_input.xml b/app/src/main/res/custom-xml/bookmark/xml/bx_popup_input.xml
deleted file mode 100644
index 618a7497..00000000
--- a/app/src/main/res/custom-xml/bookmark/xml/bx_popup_input.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-          android:top="113dp">
-        <shape xmlns:android="http://schemas.android.com/apk/res/android"
-               android:shape="rectangle" android:padding="10dp" >
-            <!-- you can use any color you want I used here gray color-->
-            <solid android:color="@color/button_gray"/>
-            <corners android:radius="0dp"/>
-        </shape>
-    </item>
-    <item android:state_pressed="false"
-          android:top="113dp">
-        <shape xmlns:android="http://schemas.android.com/apk/res/android"
-               android:shape="rectangle" android:padding="10dp">
-            <!-- you can use any color you want I used here gray color-->
-            <solid android:color="@color/white_dark"/>
-            <corners android:radius="0dp"/>
-        </shape>
-    </item>
-</selector>
-
-
-
diff --git a/app/src/main/res/custom-xml/bookmark/xml/bx_primary_gradient.xml b/app/src/main/res/custom-xml/bookmark/xml/bx_primary_gradient.xml
deleted file mode 100644
index 38ea82fe..00000000
--- a/app/src/main/res/custom-xml/bookmark/xml/bx_primary_gradient.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-            android:drawable="@color/blue"/> <!-- pressed -->
-    <item android:state_focused="true"
-            android:drawable="@color/ease_blue"/> <!-- focused -->
-    <item android:drawable="@color/ease_blue"/> <!-- default -->
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/bookmark/xml/bx_ripple_default_round.xml b/app/src/main/res/custom-xml/bookmark/xml/bx_ripple_default_round.xml
new file mode 100644
index 00000000..eceebbf4
--- /dev/null
+++ b/app/src/main/res/custom-xml/bookmark/xml/bx_ripple_default_round.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/c_ripple">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/c_gray_light" />
+            <corners android:radius="50dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/generic/xml/gx_generic_input_error.xml b/app/src/main/res/custom-xml/generic/xml/gx_generic_input_error.xml
index 9a6eb739..a9b4e02e 100644
--- a/app/src/main/res/custom-xml/generic/xml/gx_generic_input_error.xml
+++ b/app/src/main/res/custom-xml/generic/xml/gx_generic_input_error.xml
@@ -5,18 +5,18 @@
           android:top="113dp">
         <shape
             android:shape="rectangle" android:padding="10dp" >
-            <solid android:color="@color/c_edittext_background_error"/>
+            <solid android:color="@color/c_edittext_error_background"/>
             <corners android:radius="7dp"/>
-            <stroke android:width="2dp" android:color="@color/dark_red_soft"/>
+            <stroke android:width="2dp" android:color="@color/c_edittext_error_border"/>
         </shape>
     </item>
     <item android:state_pressed="false"
           android:top="113dp">
         <shape
             android:shape="rectangle" android:padding="10dp">
-            <solid android:color="@color/c_edittext_background_error"/>
+            <solid android:color="@color/c_edittext_error_background"/>
             <corners android:radius="7dp"/>
-            <stroke android:width="2dp" android:color="@color/dark_red_soft"/>
+            <stroke android:width="2dp" android:color="@color/c_edittext_error_border"/>
         </shape>
     </item>
 </selector>
diff --git a/app/src/main/res/custom-xml/generic/xml/gx_ripple_default_round.xml b/app/src/main/res/custom-xml/generic/xml/gx_ripple_default_round.xml
index 8290ae44..fbffa74a 100644
--- a/app/src/main/res/custom-xml/generic/xml/gx_ripple_default_round.xml
+++ b/app/src/main/res/custom-xml/generic/xml/gx_ripple_default_round.xml
@@ -2,7 +2,7 @@
     android:color="@color/c_ripple">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners android:radius="50dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/custom-xml/generic/xml/gx_ripple_gray.xml b/app/src/main/res/custom-xml/generic/xml/gx_ripple_gray.xml
index 59457ad2..fc16c439 100644
--- a/app/src/main/res/custom-xml/generic/xml/gx_ripple_gray.xml
+++ b/app/src/main/res/custom-xml/generic/xml/gx_ripple_gray.xml
@@ -2,7 +2,7 @@
     android:color="@color/c_ripple">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners android:radius="00dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/custom-xml/generic/xml/gx_ripple_gray_round_left.xml b/app/src/main/res/custom-xml/generic/xml/gx_ripple_gray_round_left.xml
index a0b3a925..52df40c9 100644
--- a/app/src/main/res/custom-xml/generic/xml/gx_ripple_gray_round_left.xml
+++ b/app/src/main/res/custom-xml/generic/xml/gx_ripple_gray_round_left.xml
@@ -3,7 +3,7 @@
     android:color="@color/c_ripple">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners
                 android:bottomLeftRadius="30dp"
                 android:topLeftRadius="30dp" />
diff --git a/app/src/main/res/custom-xml/generic/xml/gx_ripple_light.xml b/app/src/main/res/custom-xml/generic/xml/gx_ripple_light.xml
index bee0743d..b1ec3048 100644
--- a/app/src/main/res/custom-xml/generic/xml/gx_ripple_light.xml
+++ b/app/src/main/res/custom-xml/generic/xml/gx_ripple_light.xml
@@ -2,7 +2,7 @@
     android:color="@color/c_ripple_light">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners android:radius="00dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/custom-xml/generic/xml/gx_side_item.xml b/app/src/main/res/custom-xml/generic/xml/gx_side_item.xml
index cd012424..fd13dc6d 100644
--- a/app/src/main/res/custom-xml/generic/xml/gx_side_item.xml
+++ b/app/src/main/res/custom-xml/generic/xml/gx_side_item.xml
@@ -3,7 +3,7 @@
         android:color="@color/c_ripple_v1">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/custom-xml/generic/xml/gx_side_item_bottom.xml b/app/src/main/res/custom-xml/generic/xml/gx_side_item_bottom.xml
index e8b5894e..049c7f98 100644
--- a/app/src/main/res/custom-xml/generic/xml/gx_side_item_bottom.xml
+++ b/app/src/main/res/custom-xml/generic/xml/gx_side_item_bottom.xml
@@ -3,7 +3,7 @@
         android:color="@color/c_ripple_v1">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners
                 android:bottomLeftRadius="6dp"
                 android:bottomRightRadius="6dp"
diff --git a/app/src/main/res/custom-xml/history/xml/hx_border.xml b/app/src/main/res/custom-xml/history/xml/hx_border.xml
index 900b4ffc..9c083dc8 100644
--- a/app/src/main/res/custom-xml/history/xml/hx_border.xml
+++ b/app/src/main/res/custom-xml/history/xml/hx_border.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 <item>
     <shape android:shape="rectangle">
-        <solid android:color="@color/c_view_divier_background_inner" />
+        <solid android:color="@color/c_topbar_divider" />
     </shape>
 </item>
 <item android:bottom="1dp">
diff --git a/app/src/main/res/custom-xml/history/xml/hx_ripple_default_round_bottom.xml b/app/src/main/res/custom-xml/history/xml/hx_ripple_default_round_bottom.xml
new file mode 100644
index 00000000..fc3508a9
--- /dev/null
+++ b/app/src/main/res/custom-xml/history/xml/hx_ripple_default_round_bottom.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <corners android:radius="4.5dp" />
+            <stroke android:width="1dip" android:color="@color/c_edittext_border"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_bottom.xml b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_bottom.xml
index bd6fc42a..9851a34c 100644
--- a/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_bottom.xml
+++ b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_bottom.xml
@@ -2,9 +2,9 @@
     android:color="@color/c_ripple">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
-            <corners android:bottomLeftRadius="4dp"
-                     android:bottomRightRadius="4dp"
+            <solid android:color="@color/c_gray_light" />
+            <corners android:bottomLeftRadius="8dp"
+                     android:bottomRightRadius="8dp"
                 />
         </shape>
     </item>
diff --git a/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_left.xml b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_left.xml
index b3b1cad2..4bb88255 100644
--- a/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_left.xml
+++ b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_left.xml
@@ -2,7 +2,7 @@
     android:color="@color/c_ripple">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners android:topLeftRadius="4dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_right.xml b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_right.xml
index e0075c79..added5d1 100644
--- a/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_right.xml
+++ b/app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_right.xml
@@ -2,7 +2,7 @@
     android:color="@color/c_ripple">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners android:topRightRadius="4dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/custom-xml/home/xml/hox_menu_button.xml b/app/src/main/res/custom-xml/home/xml/hox_menu_button.xml
index 0166f12d..12538bbc 100644
--- a/app/src/main/res/custom-xml/home/xml/hox_menu_button.xml
+++ b/app/src/main/res/custom-xml/home/xml/hox_menu_button.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-            android:drawable="@color/button_gray"/> <!-- pressed -->
+            android:drawable="@color/c_gray_light"/> <!-- pressed -->
     <item android:state_focused="true"
-            android:drawable="@color/button_gray"/> <!-- focused -->
+            android:drawable="@color/c_gray_light"/> <!-- focused -->
     <item android:drawable="@color/c_background"/> <!-- default -->
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/custom-xml/home/xml/hox_rounded_corner.xml b/app/src/main/res/custom-xml/home/xml/hox_rounded_corner.xml
index ebcd1433..57c11fdb 100644
--- a/app/src/main/res/custom-xml/home/xml/hox_rounded_corner.xml
+++ b/app/src/main/res/custom-xml/home/xml/hox_rounded_corner.xml
@@ -12,8 +12,8 @@
         <shape android:shape="rectangle">
             <gradient
                     android:angle="90"
-                    android:endColor="@color/c_background"
-                    android:startColor="@color/c_background"
+                    android:endColor="@color/white"
+                    android:startColor="@color/white"
                     android:type="linear" />
             <corners android:radius="5.5dp" />
         </shape>
diff --git a/app/src/main/res/custom-xml/home/xml/hx_ripple_default_round.xml b/app/src/main/res/custom-xml/home/xml/hx_ripple_default_round.xml
index 779dab36..f28d4976 100644
--- a/app/src/main/res/custom-xml/home/xml/hx_ripple_default_round.xml
+++ b/app/src/main/res/custom-xml/home/xml/hx_ripple_default_round.xml
@@ -6,7 +6,7 @@
     <!-- mask here... -->
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="@color/button_gray" />
+            <solid android:color="@color/c_gray_light" />
             <corners android:radius="50dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_bookmark_filled.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_bookmark_filled.xml
new file mode 100644
index 00000000..faf9a821
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_bookmark_filled.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#3C5C7E"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/custom-xml/images/xml/ic_baseline_downloading.xml b/app/src/main/res/custom-xml/images/xml/ic_baseline_downloading.xml
new file mode 100644
index 00000000..e7f3742e
--- /dev/null
+++ b/app/src/main/res/custom-xml/images/xml/ic_baseline_downloading.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#3C5C7E"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18.32,4.26C16.84,3.05 15.01,2.25 13,2.05v2.02c1.46,0.18 2.79,0.76 3.9,1.62L18.32,4.26zM19.93,11h2.02c-0.2,-2.01 -1,-3.84 -2.21,-5.32L18.31,7.1C19.17,8.21 19.75,9.54 19.93,11zM18.31,16.9l1.43,1.43c1.21,-1.48 2.01,-3.32 2.21,-5.32h-2.02C19.75,14.46 19.17,15.79 18.31,16.9zM13,19.93v2.02c2.01,-0.2 3.84,-1 5.32,-2.21l-1.43,-1.43C15.79,19.17 14.46,19.75 13,19.93zM13,12V7h-2v5H7l5,5l5,-5H13zM11,19.93v2.02c-5.05,-0.5 -9,-4.76 -9,-9.95s3.95,-9.45 9,-9.95v2.02C7.05,4.56 4,7.92 4,12S7.05,19.44 11,19.93z"/>
+</vector>
diff --git a/app/src/main/res/custom-xml/images/xml/ic_shortcut_erase.xml b/app/src/main/res/custom-xml/images/xml/ic_shortcut_erase.xml
index 5983cc21..9c53f3c8 100644
--- a/app/src/main/res/custom-xml/images/xml/ic_shortcut_erase.xml
+++ b/app/src/main/res/custom-xml/images/xml/ic_shortcut_erase.xml
@@ -5,7 +5,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/c_view_divier_background_inner" />
+            <solid android:color="@color/c_topbar_divider" />
         </shape>
     </item>
     <item android:gravity="center">
diff --git a/app/src/main/res/custom-xml/images/xml/ic_shortcut_newtab.xml b/app/src/main/res/custom-xml/images/xml/ic_shortcut_newtab.xml
index 41b28ea4..d3bf68e0 100644
--- a/app/src/main/res/custom-xml/images/xml/ic_shortcut_newtab.xml
+++ b/app/src/main/res/custom-xml/images/xml/ic_shortcut_newtab.xml
@@ -5,7 +5,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/c_view_divier_background_inner" />
+            <solid android:color="@color/c_topbar_divider" />
         </shape>
     </item>
     <item android:gravity="center">
diff --git a/app/src/main/res/custom-xml/images/xml/ic_shortcut_open.xml b/app/src/main/res/custom-xml/images/xml/ic_shortcut_open.xml
index fd8c33ad..59a3308c 100644
--- a/app/src/main/res/custom-xml/images/xml/ic_shortcut_open.xml
+++ b/app/src/main/res/custom-xml/images/xml/ic_shortcut_open.xml
@@ -5,7 +5,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/c_view_divier_background_inner" />
+            <solid android:color="@color/c_topbar_divider" />
         </shape>
     </item>
     <item android:gravity="center">
diff --git a/app/src/main/res/custom-xml/setting/xml/sx_border_left.xml b/app/src/main/res/custom-xml/setting/xml/sx_border_left.xml
index 7807c26c..47b6cbaf 100644
--- a/app/src/main/res/custom-xml/setting/xml/sx_border_left.xml
+++ b/app/src/main/res/custom-xml/setting/xml/sx_border_left.xml
@@ -3,7 +3,7 @@
     <item android:left="0dp" android:right="-5dp" android:top="-5dp" android:bottom="-5dp">
         <shape
             android:shape="rectangle">
-            <stroke android:width="4dp" android:color="@color/c_text_setting_heading" />
+            <stroke android:width="4dp" android:color="@color/c_text_short_header" />
             <solid android:color="@color/c_border_background" />
         </shape>
     </item>
diff --git a/app/src/main/res/custom-xml/setting/xml/sx_spinner_style_background.xml b/app/src/main/res/custom-xml/setting/xml/sx_spinner_style_background.xml
index e64a0c11..2c028be5 100644
--- a/app/src/main/res/custom-xml/setting/xml/sx_spinner_style_background.xml
+++ b/app/src/main/res/custom-xml/setting/xml/sx_spinner_style_background.xml
@@ -10,7 +10,7 @@
                         android:topLeftRadius="5dp" android:topRightRadius="5dp"/>
                 <stroke android:width="0dp"
                         android:color="#e6e6e6" />
-                <solid android:color="@color/button_gray" />
+                <solid android:color="@color/c_gray_light" />
             </shape>
         </inset>
     </item>
@@ -23,7 +23,7 @@
                         android:topLeftRadius="5dp" android:topRightRadius="5dp"/>
                 <stroke android:width="0dp"
                         android:color="#e6e6e6" />
-                <solid android:color="@color/button_gray" />
+                <solid android:color="@color/c_gray_light" />
 
             </shape>
         </inset>
diff --git a/app/src/main/res/custom-xml/tab/xml/tx_border_round_geckoview.xml b/app/src/main/res/custom-xml/tab/xml/tx_border_round_geckoview.xml
index 9d1f1464..dfe0a97d 100644
--- a/app/src/main/res/custom-xml/tab/xml/tx_border_round_geckoview.xml
+++ b/app/src/main/res/custom-xml/tab/xml/tx_border_round_geckoview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/dark_red_soft"/>
-    <stroke android:width="0dp" android:color="@color/dark_red_soft" />
+    <solid android:color="@color/c_error_text_color"/>
+    <stroke android:width="0dp" android:color="@color/c_error_text_color" />
     <corners android:radius="10dp"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/application_crash.xml b/app/src/main/res/layouts/alert/layout/application_crash.xml
index c0ab7321..d0213aa7 100644
--- a/app/src/main/res/layouts/alert/layout/application_crash.xml
+++ b/app/src/main/res/layouts/alert/layout/application_crash.xml
@@ -4,94 +4,53 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginBottom="20dp">
+    android:layout_marginBottom="10dp">
 
-    <androidx.cardview.widget.CardView
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pMainLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
-        app:cardCornerRadius="5.5dp"
+        android:background="@xml/ax_round_corner"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/pMainLayout"
+        <TextView
+            android:id="@+id/pDescription"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@xml/hox_rounded_corner">
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:alpha="1"
+            android:lineSpacingExtra="3.5dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:text="@string/ALERT_CRASH_INFO"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_text_v8"
+            android:textSize="13.5sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="SmallSp" />
 
-            <TextView
-                android:id="@+id/pHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingStart="15dp"
-                android:paddingEnd="15dp"
-                android:text="@string/ALERT_CRASH"
-                android:textAlignment="textStart"
-                android:textColor="@color/c_text_setting_heading_v2"
-                android:textSize="17sp"
-                android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/pDescription"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:alpha="0.6"
-                android:paddingStart="15dp"
-                android:paddingEnd="15dp"
-                android:text="@string/ALERT_CRASH_INFO"
-                android:textAlignment="textStart"
-                android:textColor="@color/c_alert_text"
-                android:textSize="13sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pHeader"
-                tools:ignore="SmallSp" />
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
-            <View
-                android:id="@+id/pDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="25dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <LinearLayout
-                android:id="@+id/pNavigationContainer"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginTop="25dp"
-                android:orientation="horizontal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription">
-
-                <Button
-                    android:id="@+id/pDismiss"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@xml/ax_ripple_default_round_bottom"
-                    android:padding="0dp"
-                    android:paddingStart="15dp"
-                    android:layout_gravity="center"
-                    android:text="@string/ALERT_DISMISS"
-                    android:textAllCaps="false"
-                    android:textColor="@color/holo_gray"
-                    android:textSize="14sp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_block_popup.xml b/app/src/main/res/layouts/alert/layout/popup_block_popup.xml
index 26bbb51e..06bb8ca4 100644
--- a/app/src/main/res/layouts/alert/layout/popup_block_popup.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_block_popup.xml
@@ -22,7 +22,7 @@
             android:id="@+id/pDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
+            android:layout_marginStart="10dp"
             android:alpha="0.8"
             android:paddingStart="15dp"
             android:paddingEnd="15dp"
@@ -62,7 +62,7 @@
             android:layout_width="1dp"
             android:layout_height="30dp"
             android:layout_marginEnd="10dp"
-            android:background="@color/c_border_background_divider"
+            android:background="@color/c_navigation_medium"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml b/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml
index d24eed58..87d18417 100644
--- a/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml
@@ -6,105 +6,70 @@ xmlns:tools="http://schemas.android.com/tools"
 android:layout_width="match_parent"
 android:layout_height="match_parent">
 
-<androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:id="@+id/pMainLayout"
-    android:layout_height="wrap_content"
-    android:background="@xml/hox_rounded_corner"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintHorizontal_bias="0.5"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-    <TextView
-        android:id="@+id/pHeader"
-        android:layout_width="match_parent"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pMainLayout"
+        android:layout_width="wrap_content"
+        android:maxWidth="450dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:paddingEnd="15dp"
-        android:paddingStart="15dp"
-        android:text="@string/ALERT_BRIDGE_MAIL"
-        android:textAlignment="textStart"
-        android:textColor="@color/c_text_setting_heading_v2"
-        android:textSize="17sp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/pDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:justificationMode="inter_word"
-        android:alpha="0.6"
-        android:paddingEnd="15dp"
-        android:text="@string/ALERT_BRIDGE_MAIL_INFO"
-        android:textAlignment="textStart"
-        android:paddingStart="15dp"
-        android:textSize="13sp"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_round_corner"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:textColor="@color/c_text_v1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/pHeader"
-        tools:ignore="SmallSp" />
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent">
 
-    <View
-        android:id="@+id/pDivider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="15dp"
-        android:background="@color/c_view_divier_background"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:weightSum="2"
-        android:id="@+id/pNavigationContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/pDivider"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/pDismiss"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@xml/ax_ripple_default_round_left"
-            android:padding="0dp"
-            android:text="@string/ALERT_DISMISS"
-            android:textAllCaps="false"
-            android:textColor="@color/c_button_text_v2"
-            android:textSize="15sp"
-            android:textStyle="bold" />
-
-        <View
-            android:id="@+id/pDividerHorizontal"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/c_view_divier_background"
+        <TextView
+            android:id="@+id/pDescription"
+            android:maxWidth="450dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:alpha="1"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:text="@string/ALERT_BRIDGE_MAIL_INFO"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_text_v8"
+            android:lineSpacingExtra="3.5dp"
+            android:textSize="13.5sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pRating" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="SmallSp" />
 
         <Button
             android:id="@+id/pNext"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@xml/ax_ripple_default_round_right"
-            android:padding="0dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom"
             android:text="@string/ALERT_MAIL"
             android:textAllCaps="false"
-            android:textColor="@color/c_button_text_v1"
-            android:textSize="15sp"
-            android:textStyle="bold" />
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
-    </LinearLayout>
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom_secondary"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pNext"
+            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml b/app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml
index fcd5afd5..d2d84c73 100644
--- a/app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml
@@ -2,106 +2,71 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pToastLayoutRoot"
+    android:translationZ="5dp"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
         android:id="@+id/pMainLayout"
-        android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_background_inverted"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_CLEAR_BOOKMARK"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/pDescription"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:alpha="0.6"
-            android:paddingEnd="15dp"
+            android:layout_marginStart="10dp"
+            android:alpha="0.8"
             android:paddingStart="15dp"
-            android:textColor="@color/c_alert_text"
+            android:paddingEnd="15dp"
             android:text="@string/ALERT_CLEAR_BOOKMARK_INFO"
             android:textAlignment="textStart"
-            android:textSize="13sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            android:textColor="@color/c_alert_text_inverted"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
+        <Button
+            android:id="@+id/pNext"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1"
+            android:background="@xml/ax_ripple_default_round"
+            android:padding="0dp"
+            android:text="@string/ALERT_CONFIRM"
+            android:textAllCaps="false"
+            android:textColor="@color/c_button_text_v1_inverted"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="35dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:id="@+id/pNavigationContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider"
-            android:orientation="horizontal">
-            <Button
-                android:id="@+id/pDismiss"
-                android:textColor="@color/c_button_text_v2"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="0dp"
-                android:background="@xml/ax_ripple_default_round_left"
-                android:textSize="15sp"
-                android:textAllCaps="false"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/ALERT_DISMISS" />
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <Button
-                android:id="@+id/pNext"
-                android:textColor="@color/c_button_warning"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@xml/ax_ripple_default_round_right"
-                android:padding="0dp"
-                android:textSize="15sp"
-                android:textAllCaps="false"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/ALERT_CLEAR" />
-        </LinearLayout>
+            android:id="@+id/view6"
+            android:layout_width="1dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:background="@color/c_navigation_medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pNext"
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_clear_history.xml b/app/src/main/res/layouts/alert/layout/popup_clear_history.xml
index d114d830..7de947fc 100644
--- a/app/src/main/res/layouts/alert/layout/popup_clear_history.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_clear_history.xml
@@ -2,106 +2,71 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pToastLayoutRoot"
+    android:translationZ="5dp"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
         android:id="@+id/pMainLayout"
-        android:layout_height="wrap_content"
-        android:background="@xml/gx_rounded_corner_alert"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_background_inverted"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_CLEAR_HISTORY"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/pDescription"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:text="@string/ALERT_CLEAR_HISTORY_INFO"
-            android:textColor="@color/c_alert_text"
-            android:textAlignment="textStart"
-            android:paddingEnd="15dp"
+            android:layout_marginStart="10dp"
+            android:alpha="0.8"
             android:paddingStart="15dp"
-            android:alpha="0.6"
-            android:textSize="13sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            android:paddingEnd="15dp"
+            android:text="@string/ALERT_CLEAR_HISTORY"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_alert_text_inverted"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
+        <Button
+            android:id="@+id/pNext"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1"
+            android:background="@xml/ax_ripple_default_round"
+            android:padding="0dp"
+            android:text="@string/ALERT_CONFIRM"
+            android:textAllCaps="false"
+            android:textColor="@color/c_button_text_v1_inverted"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="35dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:id="@+id/pNavigationContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider"
-            android:orientation="horizontal">
-            <Button
-                android:id="@+id/pDismiss"
-                android:textColor="@color/c_button_text_v2"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="0dp"
-                android:background="@xml/ax_ripple_default_round_left"
-                android:textSize="15sp"
-                android:textAllCaps="false"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/ALERT_DISMISS" />
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <Button
-                android:id="@+id/pNext"
-                android:textColor="@color/c_button_warning"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@xml/ax_ripple_default_round_right"
-                android:padding="0dp"
-                android:textSize="15sp"
-                android:textAllCaps="false"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/ALERT_CLEAR" />
-        </LinearLayout>
+            android:id="@+id/view6"
+            android:layout_width="1dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:background="@color/c_navigation_medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pNext"
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml b/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml
index e5dbc8db..6396e7df 100644
--- a/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml
@@ -10,130 +10,112 @@
         android:id="@+id/pMainLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:background="@xml/ax_round_corner"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_CREATE_BOOKMARK"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/pDescription"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:alpha="0.6"
+            android:layout_marginTop="18dp"
+            android:alpha="0.8"
+            android:paddingStart="15dp"
             android:paddingEnd="10dp"
             android:text="@string/ALERT_CREATE_BOOKMARK_INFO"
             android:textAlignment="textStart"
-            android:paddingStart="15dp"
             android:textColor="@color/c_alert_text"
+            android:lineSpacingExtra="3.5dp"
             android:textSize="13sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="14dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintTop_toBottomOf="@+id/pBridgeInput" />
-
         <EditText
-            android:id="@+id/pBridgeInput"
+            android:id="@+id/pBookmarkNameInput"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
+            android:layout_marginStart="15dp"
             android:layout_marginTop="20dp"
-            android:layout_marginEnd="10dp"
+            android:layout_marginEnd="15dp"
             android:background="@xml/gx_generic_input_create_bookmark"
-            android:ems="10"
             android:elevation="3dp"
+            android:ems="10"
+            android:focusedByDefault="true"
             android:hint="@string/ALERT_TITLE_ADD"
             android:importantForAutofill="no"
             android:inputType="textNoSuggestions"
             android:maxLines="1"
-            android:focusedByDefault="true"
             android:padding="7dp"
             android:paddingStart="11dp"
             android:paddingEnd="8dp"
-            android:textColor="@color/c_text_v1"
-            android:textColorHighlight="@color/text_color_highlight_v3"
+            android:textColor="@color/c_text_v8"
+            android:textColorHighlight="@color/c_text_color_highlight_v2"
             android:textColorHint="@color/c_text_v2"
             android:textCursorDrawable="@xml/gx_search_cursor_state"
-            android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="@+id/pDivider"
+            android:textSize="13sp"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
-        <View
-            android:id="@+id/pDivider"
+        <TextView
+            android:id="@+id/pURL"
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="14dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintTop_toBottomOf="@+id/pBridgeInput" />
-
-        <LinearLayout
-            android:id="@+id/pNavigationContainer"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal"
+            android:layout_height="35dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="13dp"
+            android:background="@xml/hx_ripple_default_round_bottom"
+            android:ellipsize="end"
+            android:gravity="center_vertical | start"
+            android:maxLines="1"
+            android:paddingStart="11dp"
+            android:paddingEnd="15dp"
+            android:text="@string/BOOKMARK_EMPTY"
+            android:textColor="@color/c_text_v2"
+            android:textSize="12.5sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider">
+            app:layout_constraintTop_toBottomOf="@+id/pBookmarkNameInput" />
 
-            <Button
-                android:id="@+id/pDismiss"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_left"
-                android:padding="0dp"
-                android:text="@string/ALERT_DISMISS"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v2"
-                android:textSize="15sp"
-                android:textStyle="bold" />
+        <Button
+            android:id="@+id/pNext"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="14dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom"
+            android:text="@string/ALERT_ADD"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pURL" />
 
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom_secondary"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pNext"
+            app:layout_constraintTop_toBottomOf="@+id/pURL" />
 
-            <Button
-                android:id="@+id/pNext"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_right"
-                android:padding="0dp"
-                android:text="@string/ALERT_ADD"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v1"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_data_cleared.xml b/app/src/main/res/layouts/alert/layout/popup_data_cleared.xml
index 86e56055..8ae707dd 100644
--- a/app/src/main/res/layouts/alert/layout/popup_data_cleared.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_data_cleared.xml
@@ -2,95 +2,73 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pToastLayoutRoot"
+    android:translationZ="5dp"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_marginBottom="20dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.cardview.widget.CardView
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pMainLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="5.5dp"
+        android:layout_height="55dp"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_background_inverted"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintStart_toStartOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/pMainLayout"
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/pDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:alpha="0.8"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:text="@string/ALERT_DATA_CLEARED_INFO"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_alert_text_inverted"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="SmallSp" />
+
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="@xml/hox_rounded_corner">
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1"
+            android:background="@xml/ax_ripple_default_round"
+            android:padding="0dp"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/c_button_text_v1_inverted"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/pHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingEnd="15dp"
-                android:paddingStart="15dp"
-                android:text="@string/ALERT_DATA_CLEARED"
-                android:textAlignment="textStart"
-                android:textColor="@color/c_text_setting_heading_v2"
-                android:textSize="17sp"
-                android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <View
+            android:id="@+id/view6"
+            android:layout_width="1dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:background="@color/c_navigation_medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pDismiss"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/pDescription"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:alpha="0.6"
-                android:paddingEnd="15dp"
-                android:paddingStart="15dp"
-                android:text="@string/ALERT_DATA_CLEARED_INFO"
-                android:textAlignment="textStart"
-                android:textColor="@color/c_alert_text"
-                android:textSize="13sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pHeader"
-                tools:ignore="SmallSp" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <View
-                android:id="@+id/pDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="25dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
-            <LinearLayout
-                android:id="@+id/pNavigationContainer"
-                android:layout_width="409dp"
-                android:layout_height="50dp"
-                android:layout_marginTop="25dp"
-                android:orientation="horizontal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription">
 
-                <Button
-                    android:id="@+id/pDismiss"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@xml/ax_ripple_default_round_bottom"
-                    android:padding="0dp"
-                    android:text="@string/ALERT_DISMISS"
-                    android:textAllCaps="false"
-                    android:textColor="@color/c_button_text_v1"
-                    android:textSize="15sp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml b/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml
index 31e64695..6378e64e 100644
--- a/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml
@@ -1,97 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pToastLayoutRoot"
+    android:translationZ="5dp"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginBottom="20dp">
+    android:layout_height="match_parent">
 
-    <androidx.cardview.widget.CardView
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pMainLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
-        app:cardCornerRadius="5.5dp"
+        android:layout_height="55dp"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_background_inverted"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/pMainLayout"
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/pDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:alpha="0.8"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:text="@string/ALERT_DATA_CLEARED_SHORTCUT"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_alert_text_inverted"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="SmallSp" />
+
+        <Button
+            android:id="@+id/pOpenPrivacy"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="@xml/hox_rounded_corner">
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1"
+            android:background="@xml/ax_ripple_default_round"
+            android:padding="0dp"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/c_button_text_v1_inverted"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/pHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:paddingStart="15dp"
-                android:paddingEnd="15dp"
-                android:text="@string/ALERT_DATA_CLEARED_SHORTCUT"
-                android:textAlignment="textStart"
-                android:textColor="@color/c_text_setting_heading_v2"
-                android:textSize="17sp"
-                android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <View
+            android:id="@+id/view6"
+            android:layout_width="1dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:background="@color/c_navigation_medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/pDescription"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:alpha="0.6"
-                android:paddingStart="15dp"
-                android:paddingEnd="15dp"
-                android:text="@string/ALERT_DATA_CLEARED_INFO_SHORTCUT"
-                android:textAlignment="textStart"
-                android:textColor="@color/c_alert_text"
-                android:textSize="13sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pHeader"
-                tools:ignore="SmallSp" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <View
-                android:id="@+id/pDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="25dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
-            <LinearLayout
-                android:id="@+id/pNavigationContainer"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginTop="25dp"
-                android:orientation="horizontal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription">
 
-                <Button
-                    android:id="@+id/pDismiss"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@xml/ax_ripple_default_round_bottom"
-                    android:padding="0dp"
-                    android:paddingStart="15dp"
-                    android:text="@string/ALERT_DATA_CLEARED_BUTTON"
-                    android:textAlignment="textStart"
-                    android:textAllCaps="false"
-                    android:textColor="@color/holo_gray"
-                    android:textSize="14sp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_download_failure.xml b/app/src/main/res/layouts/alert/layout/popup_download_failure.xml
index 72237b99..c5e34bea 100644
--- a/app/src/main/res/layouts/alert/layout/popup_download_failure.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_download_failure.xml
@@ -65,7 +65,7 @@
             android:layout_width="1dp"
             android:layout_height="30dp"
             android:layout_marginEnd="10dp"
-            android:background="@color/c_border_background_divider"
+            android:background="@color/c_navigation_medium"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/pDismiss"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layouts/alert/layout/popup_download_full.xml b/app/src/main/res/layouts/alert/layout/popup_download_full.xml
index cc08785b..d429686c 100644
--- a/app/src/main/res/layouts/alert/layout/popup_download_full.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_download_full.xml
@@ -7,61 +7,88 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
         android:id="@+id/pMainLayout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:background="@xml/ax_round_corner"
+        android:paddingBottom="6dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingStart="15dp"
-            android:layout_marginEnd="30dp"
-            android:singleLine="true"
-            android:text="@string/ALERT_DOWNLOAD"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cardView2"
+            android:layout_width="34dp"
+            android:layout_height="34dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="12dp"
+            android:gravity="center_vertical"
+            app:cardCornerRadius="5dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="RtlSymmetry" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/pFaviconLogo"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:contentDescription="@string/GENERAL_TODO"
+                android:src="@xml/ic_baseline_browser"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                tools:ignore="RtlCompat" />
+        </androidx.cardview.widget.CardView>
 
         <TextView
             android:id="@+id/pDescription"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="11dp"
             android:alpha="0.6"
-            android:gravity="start"
+            android:gravity="start |center_vertical"
+            android:maxLines="1"
             android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:paddingEnd="41dp"
             android:text="@string/GENERAL_DEFAULT_TEXT"
-            android:textAlignment="viewStart"
             android:textColor="@color/c_alert_text"
             android:textDirection="locale"
-            android:maxLines="5"
-            android:textSize="12sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            android:textSize="13.5sp"
+            android:translationY="-1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/cardView2"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="SmallSp" />
+
+        <TextView
+            android:id="@+id/pDescriptionShort"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:alpha="0.6"
+            android:gravity="start |center_vertical"
+            android:maxLines="1"
+            android:paddingStart="16.6dp"
+            android:paddingEnd="41dp"
+            android:text="@string/GENERAL_DEFAULT_TEXT"
+            android:textColor="@color/c_alert_text"
+            android:textDirection="locale"
+            android:textSize="11sp"
+            android:translationY="-1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/cardView2"
+            app:layout_constraintTop_toBottomOf="@+id/pDescription"
             tools:ignore="SmallSp" />
 
         <View
             android:id="@+id/pDivider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="15dp"
             android:background="@color/c_view_divier_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/cardView2" />
 
         <LinearLayout
             android:id="@+id/pNavigationContainer"
@@ -104,11 +131,11 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/GENERAL_TODO"
                     android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
                     android:scaleY="0.5"
                     app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
@@ -151,11 +178,11 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/GENERAL_TODO"
                     android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
                     android:scaleY="0.5"
                     app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
@@ -197,12 +224,12 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    app:tint="@color/c_navigation_tint"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/GENERAL_TODO"
                     android:scaleX="0.5"
                     android:scaleY="0.5"
                     app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
@@ -247,11 +274,11 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
-                    app:tint="@color/c_navigation_tint"
+                    android:contentDescription="@string/GENERAL_TODO"
                     android:scaleX="0.5"
                     android:scaleY="0.5"
                     app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
@@ -296,11 +323,11 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
-                    app:tint="@color/c_navigation_tint"
+                    android:contentDescription="@string/GENERAL_TODO"
                     android:scaleX="0.5"
                     android:scaleY="0.5"
                     app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
@@ -345,11 +372,11 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
-                    app:tint="@color/c_navigation_tint"
+                    android:contentDescription="@string/GENERAL_TODO"
                     android:scaleX="0.5"
                     android:scaleY="0.5"
                     app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
@@ -365,7 +392,7 @@
                 android:id="@+id/pOption7"
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:background="@xml/gx_ripple_gray"
+                android:background="@xml/gx_ripple_gray_bottom"
                 android:clickable="true"
                 android:focusable="true"
                 android:orientation="horizontal"
@@ -394,24 +421,14 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
+                    android:contentDescription="@string/GENERAL_TODO"
                     android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
                     android:scaleY="0.5"
                     app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginEnd="30dp"
-                android:layout_marginStart="30dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/alert/layout/popup_download_url.xml b/app/src/main/res/layouts/alert/layout/popup_download_url.xml
index fc471bdc..6cd7919d 100644
--- a/app/src/main/res/layouts/alert/layout/popup_download_url.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_download_url.xml
@@ -9,31 +9,41 @@
         android:id="@+id/pMainLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_round_corner"
         android:minHeight="130dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintStart_toStartOf="parent">
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="185dp"
+            android:layout_height="14dp"
+            android:layout_marginEnd="15dp"
+            android:indeterminate="true"
+            android:indeterminateTint="@color/ease_blue"
+            android:translationY="-4dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <ImageView
             android:id="@+id/imageView2"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_marginStart="14dp"
-            android:layout_marginTop="11dp"
+            android:layout_marginTop="15dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_download"
+            app:srcCompat="@xml/ic_baseline_downloading"
             app:tint="@color/c_icon_tint" />
 
         <TextView
             android:id="@+id/pHeader"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="14dp"
             android:ellipsize="end"
             android:paddingStart="15dp"
             android:paddingEnd="15dp"
@@ -46,91 +56,79 @@
             app:layout_constraintStart_toEndOf="@+id/imageView2"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="19dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader" />
-
         <TextView
             android:id="@+id/pDescription"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="4dp"
             android:layout_marginEnd="3dp"
             android:alpha="0.6"
-            android:maxLines="5"
+            android:maxLines="1"
             android:paddingStart="15dp"
             android:paddingEnd="15dp"
+            android:text="hello_kitty_sample.mp4"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_alert_text"
+            android:textSize="12.5sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintStart_toEndOf="@+id/imageView2"
+            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            tools:ignore="SmallSp" />
+
+        <TextView
+            android:id="@+id/pDescriptionLong"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="3dp"
+            android:alpha="0.6"
+            android:maxLines="1"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:text="hello_kitty_sample.mp4"
             android:textAlignment="textStart"
             android:textColor="@color/c_alert_text"
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintStart_toEndOf="@+id/imageView2"
+            app:layout_constraintTop_toBottomOf="@+id/pDescription"
             tools:ignore="SmallSp" />
 
-        <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
+        <Button
+            android:id="@+id/pNext"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
             android:layout_marginTop="20dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintBottom_toTopOf="@+id/pNavigationContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-        <LinearLayout
-            android:id="@+id/pNavigationContainer"
-            android:layout_width="match_parent"
-            android:layout_height="45dp"
-            android:orientation="horizontal"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="17dp"
+            android:background="@xml/ax_ripple_default_round_bottom"
+            android:text="@string/ALERT_DOWNLOAD_SINGLE_BUTTON"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider">
+            app:layout_constraintTop_toBottomOf="@+id/pDescriptionLong" />
 
-            <Button
-                android:id="@+id/pDismiss"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_left"
-                android:padding="0dp"
-                android:text="@string/ALERT_DISMISS"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v2"
-                android:textSize="14.5sp"
-                android:textStyle="bold" />
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <Button
-                android:id="@+id/pNext"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_right"
-                android:padding="0dp"
-                android:text="@string/ALERT_DOWNLOAD_SINGLE_BUTTON"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v3"
-                android:textSize="14.5sp"
-                android:textStyle="bold" />
-        </LinearLayout>
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="17dp"
+            android:background="@xml/ax_ripple_default_round_bottom_secondary"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pNext"
+            app:layout_constraintTop_toBottomOf="@+id/pDescriptionLong" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml b/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml
index 0a2b8846..70cbe8b6 100644
--- a/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml
@@ -10,56 +10,66 @@
         android:layout_width="match_parent"
         android:id="@+id/pMainLayout"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:background="@xml/ax_round_corner"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_LONG_FILE"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cardView2"
+            android:layout_width="34dp"
+            android:layout_height="34dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="12dp"
+            android:gravity="center_vertical"
+            android:padding="20dp"
+            app:cardCornerRadius="5dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/pFaviconLogo"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:contentDescription="@string/GENERAL_TODO"
+                android:src="@xml/ic_baseline_browser"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                tools:ignore="RtlCompat" />
+        </androidx.cardview.widget.CardView>
 
         <TextView
             android:id="@+id/pDescription"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="12dp"
             android:alpha="0.6"
-            android:maxLines="5"
-            android:ellipsize="start"
+            android:gravity="start |center_vertical"
+            android:maxLines="2"
             android:paddingStart="15dp"
-            android:paddingEnd="15dp"
+            android:paddingEnd="41dp"
             android:text="@string/GENERAL_DEFAULT_TEXT"
-            android:textAlignment="viewStart"
             android:textColor="@color/c_alert_text"
             android:textDirection="locale"
             android:textSize="12sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            android:translationY="-1dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/cardView2"
+            app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
+
         <View
             android:id="@+id/pDivider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="15dp"
             android:background="@color/c_view_divier_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/cardView2" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -103,8 +113,8 @@
                     android:background="@android:color/transparent"
                     android:scaleX="0.5"
                     android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right"
-                    app:tint="@color/c_navigation_tint" />
+                    app:tint="@color/cursor_blue"
+                    app:srcCompat="@xml/ic_arrow_right" />
 
             </LinearLayout>
 
@@ -149,7 +159,7 @@
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
                     android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
+                    app:tint="@color/cursor_blue"
                     android:scaleY="0.5"
                     app:srcCompat="@xml/ic_arrow_right" />
 
@@ -195,7 +205,7 @@
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
                     android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
+                    app:tint="@color/cursor_blue"
                     android:scaleY="0.5"
                     app:srcCompat="@xml/ic_arrow_right" />
 
@@ -242,7 +252,7 @@
                     android:background="@android:color/transparent"
                     android:scaleX="0.5"
                     android:scaleY="0.5"
-                    app:tint="@color/c_navigation_tint"
+                    app:tint="@color/cursor_blue"
                     app:srcCompat="@xml/ic_arrow_right" />
 
             </LinearLayout>
@@ -261,6 +271,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
+                android:paddingBottom="6dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/pDivider">
@@ -270,9 +281,9 @@
                     android:layout_width="0dp"
                     android:layout_height="45dp"
                     android:layout_weight="1"
-                    android:background="@xml/ax_ripple_default_round_bottom"
                     android:padding="0dp"
                     android:text="@string/ALERT_DISMISS"
+                    android:background="@xml/gx_ripple_gray_bottom"
                     android:textAlignment="center"
                     android:textAllCaps="false"
                     android:textColor="@color/c_button_text_v1"
diff --git a/app/src/main/res/layouts/alert/layout/popup_find.xml b/app/src/main/res/layouts/alert/layout/popup_find.xml
index 46469425..d4369fa2 100644
--- a/app/src/main/res/layouts/alert/layout/popup_find.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_find.xml
@@ -55,7 +55,7 @@
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
             android:layout_marginEnd="5dp"
-            android:background="@color/c_view_divier_background_inner_v1"
+            android:background="@color/c_divider_line_light"
             app:layout_constraintBottom_toTopOf="@+id/pNavigationContainer" />
 
         <ImageButton
diff --git a/app/src/main/res/layouts/alert/layout/popup_language_support.xml b/app/src/main/res/layouts/alert/layout/popup_language_support.xml
index 50efc8d1..a273f4f1 100644
--- a/app/src/main/res/layouts/alert/layout/popup_language_support.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_language_support.xml
@@ -2,100 +2,73 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pToastLayoutRoot"
+    android:translationZ="5dp"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
         android:id="@+id/pMainLayout"
-        android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_background_inverted"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
+            android:id="@+id/pDescription"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="10dp"
+            android:alpha="0.8"
             android:paddingStart="15dp"
             android:paddingEnd="15dp"
             android:text="@string/ALERT_LANGUAGE_SUPPORT_FAILURE"
             android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
+            android:textColor="@color/c_alert_text_inverted"
+            android:textSize="14sp"
             android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
             app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="RtlSymmetry" />
-
-        <TextView
-            android:id="@+id/pLanguage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="5dp"
-            android:text="Deuche (de)"
-            android:textDirection="locale"
-            android:textAlignment="viewStart"
-            android:textColor="@color/c_text_v6"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader" />
-
-        <TextView
-            android:id="@+id/pDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textDirection="locale"
-            android:textAlignment="viewStart"
-            android:layout_marginTop="35dp"
-            android:alpha="0.6"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
-            android:text="@string/ALERT_LANGUAGE_SUPPORT_FAILURE_INFO"
-            android:textColor="@color/c_alert_text"
-            android:textSize="13sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
             tools:ignore="SmallSp" />
 
+        <Button
+            android:id="@+id/pOpenPrivacy"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1"
+            android:background="@xml/ax_ripple_default_round"
+            android:padding="0dp"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/c_button_text_v1_inverted"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="25dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:id="@+id/pNavigationContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/pDismiss"
-                android:textColor="@color/c_button_text_v3"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:textAlignment="center"
-                android:background="@xml/ax_ripple_default_round_bottom"
-                android:textSize="15sp"
-                android:textAllCaps="false"
-                android:textStyle="bold"
-                android:text="@string/ALERT_DISMISS" />
-        </LinearLayout>
+            android:id="@+id/view6"
+            android:layout_width="1dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:background="@color/c_navigation_medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy"
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_max_tab.xml b/app/src/main/res/layouts/alert/layout/popup_max_tab.xml
index 5b973d03..5ed08587 100644
--- a/app/src/main/res/layouts/alert/layout/popup_max_tab.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_max_tab.xml
@@ -62,7 +62,7 @@
             android:layout_width="1dp"
             android:layout_height="30dp"
             android:layout_marginEnd="10dp"
-            android:background="@color/c_border_background_divider"
+            android:background="@color/c_navigation_medium"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/pDismiss"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layouts/alert/layout/popup_new_circuit.xml b/app/src/main/res/layouts/alert/layout/popup_new_circuit.xml
index eab56214..e23ff56a 100644
--- a/app/src/main/res/layouts/alert/layout/popup_new_circuit.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_new_circuit.xml
@@ -60,7 +60,7 @@
             android:layout_width="1dp"
             android:layout_height="30dp"
             android:layout_marginEnd="10dp"
-            android:background="@color/c_border_background_divider"
+            android:background="@color/c_navigation_medium"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/pDismiss"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layouts/alert/layout/popup_not_supported.xml b/app/src/main/res/layouts/alert/layout/popup_not_supported.xml
index a37fd41b..a87fcd91 100644
--- a/app/src/main/res/layouts/alert/layout/popup_not_supported.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_not_supported.xml
@@ -12,7 +12,7 @@
         android:id="@+id/pMainLayout"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:layout_marginBottom="25dp"
+        android:layout_marginBottom="15dp"
         android:background="@xml/ax_background_inverted"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -61,7 +61,7 @@
             android:layout_width="1dp"
             android:layout_height="30dp"
             android:layout_marginEnd="10dp"
-            android:background="@color/c_border_background_divider"
+            android:background="@color/c_navigation_medium"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/pDismiss"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml b/app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml
index 3a112032..3d963d40 100644
--- a/app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml
@@ -12,6 +12,7 @@
         android:id="@+id/pMainLayout"
         android:layout_width="match_parent"
         android:layout_height="60dp"
+        android:layout_marginBottom="10dp"
         android:background="@xml/ax_background_inverted"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -22,8 +23,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
+            android:layout_marginBottom="4dp"
             android:alpha="0.8"
-            app:layout_constraintHorizontal_weight="1"
             android:text="@string/ALERT_ORBOT_LOADING_INFO"
             android:textAlignment="textStart"
             android:textColor="@color/c_alert_text_inverted"
@@ -31,12 +32,13 @@
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/view6"
+            app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="@+id/pMainLayout"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
         <Button
-            android:id="@+id/pDismiss"
+            android:id="@+id/pNext"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginTop="10dp"
@@ -47,7 +49,7 @@
             android:padding="0dp"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
-            android:text="@string/ALERT_DISMISS"
+            android:text="@string/ALERT_ORBOT_LOADING_BUTTON"
             android:textAllCaps="false"
             android:textColor="@color/c_button_text_v1_inverted"
             android:textSize="15sp"
@@ -61,9 +63,9 @@
             android:layout_width="1dp"
             android:layout_height="30dp"
             android:layout_marginEnd="10dp"
-            android:background="@color/c_border_background_divider"
+            android:background="@color/c_navigation_medium"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/pDismiss"
+            app:layout_constraintEnd_toStartOf="@+id/pNext"
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layouts/alert/layout/popup_panic.xml b/app/src/main/res/layouts/alert/layout/popup_panic.xml
index feffe7b7..1c231989 100644
--- a/app/src/main/res/layouts/alert/layout/popup_panic.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_panic.xml
@@ -4,106 +4,72 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_marginBottom="15dp"
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
         android:id="@+id/pMainLayout"
+        android:layout_width="wrap_content"
+        android:maxWidth="450dp"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_round_corner"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_PANIC"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/pDescription"
+            android:maxWidth="450dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:paddingEnd="15dp"
+            android:layout_marginTop="18dp"
+            android:alpha="1"
             android:paddingStart="15dp"
+            android:paddingEnd="15dp"
             android:text="@string/ALERT_PANIC_INFO"
             android:textAlignment="textStart"
-            android:textColor="@color/c_alert_text"
-            android:textSize="13sp"
-            android:alpha="0.6"
+            android:textColor="@color/c_text_v8"
+            android:lineSpacingExtra="3.5dp"
+            android:textSize="13.5sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
-        <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="25dp"
-            android:background="@color/c_view_divier_background"
+        <Button
+            android:id="@+id/pNext"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="25dp"
+            android:background="@xml/ax_ripple_default_round_bottom"
+            android:text="@string/ALERT_PANIC_BT_1"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
-        <LinearLayout
-            android:id="@+id/pNavigationContainer"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-            <Button
-                android:id="@+id/pDismiss"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_left"
-                android:padding="0dp"
-                android:text="@string/ALERT_PANIC_BT_2"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v2"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pRating" />
-
-            <Button
-                android:id="@+id/pNext"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_right"
-                android:padding="0dp"
-                android:text="@string/ALERT_PANIC_BT_1"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_warning"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-        </LinearLayout>
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="30dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="25dp"
+            android:background="@xml/ax_ripple_default_round_bottom_secondary"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pNext"
+            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml b/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml
index 65ea30ba..55e7fca4 100644
--- a/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml
@@ -7,103 +7,69 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
         android:id="@+id/pMainLayout"
+        android:layout_width="wrap_content"
+        android:maxWidth="450dp"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_round_corner"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_RATEUS_FAILURE"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/pDescription"
+            android:maxWidth="450dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:alpha="0.6"
-            android:textColor="@color/c_alert_text"
-            android:paddingEnd="15dp"
+            android:layout_marginTop="18dp"
+            android:alpha="1"
             android:paddingStart="15dp"
+            android:paddingEnd="15dp"
             android:text="@string/ALERT_RATEUS_FAILURE_INFO"
             android:textAlignment="textStart"
-            android:textSize="13sp"
+            android:textColor="@color/c_text_v8"
+            android:lineSpacingExtra="3.5dp"
+            android:textSize="13.5sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
-        <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
+        <Button
+            android:id="@+id/pNext"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
             android:layout_marginTop="25dp"
-            android:background="@color/c_view_divier_background"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom"
+            android:text="@string/ALERT_MAIL"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:id="@+id/pNavigationContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider"
-            android:orientation="horizontal">
-            <Button
-                android:id="@+id/pDismiss"
-                android:textColor="@color/c_button_text_v2"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="0dp"
-                android:textAlignment="center"
-                android:background="@xml/ax_ripple_default_round_left"
-                android:textSize="15sp"
-                android:textAllCaps="false"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/ALERT_DISMISS" />
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <Button
-                android:id="@+id/pNext"
-                android:textColor="@color/c_button_text_v3"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:textAlignment="center"
-                android:background="@xml/ax_ripple_default_round_right"
-                android:padding="0dp"
-                android:textSize="15sp"
-                android:textAllCaps="false"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/ALERT_MAIL" />
-        </LinearLayout>
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom_secondary"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pNext"
+            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_rate_us.xml b/app/src/main/res/layouts/alert/layout/popup_rate_us.xml
index 6be42086..a7c2c625 100644
--- a/app/src/main/res/layouts/alert/layout/popup_rate_us.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_rate_us.xml
@@ -10,7 +10,7 @@
         android:id="@+id/pMainLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:background="@xml/ax_round_corner"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -21,7 +21,7 @@
             android:id="@+id/pHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="15dp"
             android:text="@string/ALERT_RATEUS"
             android:textAlignment="textStart"
             android:textColor="@color/c_text_setting_heading_v2"
@@ -55,12 +55,12 @@
             android:id="@+id/pRating"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
             android:foregroundTint="@color/white"
             android:progressBackgroundTint="@color/c_rateus_warning"
+            android:rating="0.5"
             android:scaleX="0.65"
             android:scaleY="0.65"
-            android:rating="0.5"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -68,60 +68,42 @@
 
         </RatingBar>
 
-        <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="5dp"
-            android:background="@color/c_view_divier_background"
+        <Button
+            android:id="@+id/pNext"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="15dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom"
+            android:text="@string/ALERT_RATE"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.73"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/pRating" />
 
-        <LinearLayout
-            android:id="@+id/pNavigationContainer"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="15dp"
+            android:layout_marginEnd="15dp"
+            android:background="@xml/ax_ripple_default_round_bottom_secondary"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintEnd_toStartOf="@+id/pNext"
+            app:layout_constraintHorizontal_bias="0.83"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider">
+            app:layout_constraintTop_toBottomOf="@+id/pRating" />
 
-            <Button
-                android:id="@+id/pDismiss"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_left"
-                android:padding="0dp"
-                android:text="@string/ALERT_DISMISS"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v2"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pRating" />
-
-            <Button
-                android:id="@+id/pNext"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_right"
-                android:padding="0dp"
-                android:text="@string/ALERT_RATE"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v3"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_remove_bookmark.xml b/app/src/main/res/layouts/alert/layout/popup_remove_bookmark.xml
new file mode 100644
index 00000000..6b18711c
--- /dev/null
+++ b/app/src/main/res/layouts/alert/layout/popup_remove_bookmark.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pToastLayoutRoot"
+    android:translationZ="5dp"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pMainLayout"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_background_inverted"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <TextView
+            android:id="@+id/pDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:alpha="0.8"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:text="@string/HOME_MENU__BOOKMARK_REMOVED"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_alert_text_inverted"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="SmallSp" />
+
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1"
+            android:background="@xml/ax_ripple_default_round"
+            android:padding="0dp"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/c_button_text_v1_inverted"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/view6"
+            android:layout_width="1dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:background="@color/c_navigation_medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pDismiss"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_report_url.xml b/app/src/main/res/layouts/alert/layout/popup_report_url.xml
deleted file mode 100644
index 8fe419af..00000000
--- a/app/src/main/res/layouts/alert/layout/popup_report_url.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_REPORT_URL"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/pDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:layout_marginEnd="3dp"
-            android:alpha="0.6"
-            android:paddingStart="15dp"
-            android:paddingEnd="10dp"
-            android:text="@string/ALERT_REPORT_URL_INFO"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_alert_text"
-            android:textSize="13sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
-            tools:ignore="SmallSp" />
-
-        <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="35dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-        <LinearLayout
-            android:id="@+id/pNavigationContainer"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-            <Button
-                android:id="@+id/pDismiss"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_left"
-                android:padding="0dp"
-                android:text="@string/ALERT_DISMISS"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v2"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <Button
-                android:id="@+id/pNext"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_right"
-                android:padding="0dp"
-                android:text="@string/ALERT_REPORT"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v3"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_reported_successfully.xml b/app/src/main/res/layouts/alert/layout/popup_reported_successfully.xml
deleted file mode 100644
index 6bfb3833..00000000
--- a/app/src/main/res/layouts/alert/layout/popup_reported_successfully.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:id="@+id/pMainLayout"
-        android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_REPORT_URL_SUCCESS"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/pDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_REPORT_URL_SUCCESS_INFO"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_alert_text"
-            android:textSize="13sp"
-            android:alpha="0.6"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
-            tools:ignore="SmallSp" />
-
-        <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="25dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:id="@+id/pNavigationContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider"
-            android:orientation="horizontal">
-            <Button
-                android:id="@+id/pNext"
-                android:textColor="@color/c_button_text_v1"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="0dp"
-                android:background="@xml/ax_ripple_default_round_bottom"
-                android:textSize="15sp"
-                android:textAllCaps="false"
-                android:layout_weight="1"
-                android:textStyle="bold"/>
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-        </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_update_bookmark.xml b/app/src/main/res/layouts/alert/layout/popup_update_bookmark.xml
new file mode 100644
index 00000000..5dd2eba0
--- /dev/null
+++ b/app/src/main/res/layouts/alert/layout/popup_update_bookmark.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pToastLayoutRoot"
+    android:translationZ="5dp"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/pMainLayout"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginBottom="10dp"
+        android:background="@xml/ax_background_inverted"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <TextView
+            android:id="@+id/pDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:alpha="0.8"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:text="@string/HOME_MENU__BOOKMARK_UPDATE"
+            android:textAlignment="textStart"
+            android:textColor="@color/c_alert_text_inverted"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/pMainLayout"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="SmallSp" />
+
+        <Button
+            android:id="@+id/pDismiss"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_weight="1"
+            android:background="@xml/ax_ripple_default_round"
+            android:padding="0dp"
+            android:text="@string/ALERT_DISMISS"
+            android:textAllCaps="false"
+            android:textColor="@color/c_button_text_v1_inverted"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/view6"
+            android:layout_width="1dp"
+            android:layout_height="30dp"
+            android:layout_marginEnd="10dp"
+            android:background="@color/c_navigation_medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pDismiss"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml b/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml
index 866a40a3..f7754066 100644
--- a/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml
@@ -10,43 +10,29 @@
         android:id="@+id/pMainLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:background="@xml/ax_round_corner"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
-            android:text="@string/ALERT_UPDATE_BRIDGES"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/pDescription"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:alpha="0.6"
+            android:layout_marginTop="18dp"
+            android:alpha="0.8"
             android:paddingStart="15dp"
             android:paddingEnd="15dp"
             android:text="@string/ALERT_UPDATE_BRIDGES_INFO"
+            android:lineSpacingExtra="3.5dp"
             android:textAlignment="textStart"
             android:textColor="@color/c_alert_text"
             android:textSize="13sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
         <TextView
@@ -74,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_marginTop="15dp"
-            android:layout_marginEnd="48dp"
+            android:layout_marginEnd="60dp"
             android:background="@xml/gx_generic_input"
             android:elevation="3dp"
             android:ems="10"
@@ -86,7 +72,7 @@
             android:paddingStart="11dp"
             android:paddingEnd="8dp"
             android:textColor="@color/c_text_v1"
-            android:textColorHighlight="@color/text_color_highlight_v3"
+            android:textColorHighlight="@color/c_text_color_highlight_v2"
             android:textColorHint="@color/c_text_v2"
             android:textCursorDrawable="@xml/gx_search_cursor_state"
             android:textSize="14sp"
@@ -113,11 +99,10 @@
             android:paddingStart="11dp"
             android:paddingEnd="8dp"
             android:textColor="@color/c_text_v1"
-            android:textColorHighlight="@color/text_color_highlight_v3"
+            android:textColorHighlight="@color/c_text_color_highlight_v2"
             android:textColorHint="@color/c_text_v2"
             android:textCursorDrawable="@xml/gx_search_cursor_state"
             android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="@+id/pDivider"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/pBridgeInput" />
 
@@ -126,7 +111,7 @@
             android:layout_width="33dp"
             android:layout_height="33dp"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="9dp"
+            android:layout_marginEnd="17dp"
             android:layout_marginBottom="4dp"
             android:elevation="3dp"
             android:background="@xml/hox_rounded_corner_splash"
@@ -136,60 +121,39 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/pDescription" />
 
-        <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/c_view_divier_background"
+        <Button
+            android:id="@+id/pBridgeRequest"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom"
+            android:text="@string/ALERT_SAVE_BRIDGE"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescriptionError" />
+            app:layout_constraintTop_toBottomOf="@+id/pBridgeInput" />
 
-        <LinearLayout
-            android:id="@+id/pNavigationContainer"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-            <Button
-                android:id="@+id/pBridgeRequest"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_left"
-                android:padding="0dp"
-                android:text="@string/ALERT_REQUEST_BRIDGE"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v1"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <Button
-                android:id="@+id/pNext"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@xml/ax_ripple_default_round_right"
-                android:padding="0dp"
-                android:text="@string/ALERT_SAVE_BRIDGE"
-                android:textAllCaps="false"
-                android:textColor="@color/c_button_text_v1"
-                android:textSize="15sp"
-                android:textStyle="bold" />
-        </LinearLayout>
+        <Button
+            android:id="@+id/pNext"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="20dp"
+            android:background="@xml/ax_ripple_default_round_bottom_secondary"
+            android:text="@string/ALERT_REQUEST_BRIDGE"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/pBridgeRequest"
+            app:layout_constraintTop_toBottomOf="@+id/pBridgeInput" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml b/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml
index f8f27006..abac2f8b 100644
--- a/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml
+++ b/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml
@@ -7,68 +7,78 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
         android:id="@+id/pMainLayout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
+        android:background="@xml/ax_round_corner"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_LONG_URL"
-            android:gravity="start"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textStyle="bold"
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cardView2"
+            android:layout_width="34dp"
+            android:layout_height="34dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="12dp"
+            android:gravity="center_vertical"
+            android:padding="20dp"
+            app:cardCornerRadius="5dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/pFaviconLogo"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:contentDescription="@string/GENERAL_TODO"
+                android:src="@xml/ic_baseline_browser"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                tools:ignore="RtlCompat" />
+        </androidx.cardview.widget.CardView>
 
         <TextView
             android:id="@+id/pDescription"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/GENERAL_DEFAULT_TEXT"
-            android:paddingStart="15dp"
-            android:textColor="@color/c_alert_text"
+            android:layout_marginTop="12dp"
             android:alpha="0.6"
-            android:paddingEnd="15dp"
-            android:maxLines="5"
-            android:layout_marginEnd="20dp"
+            android:gravity="start |center_vertical"
+            android:maxLines="2"
+            android:paddingStart="15dp"
+            android:paddingEnd="41dp"
+            android:text="@string/GENERAL_DEFAULT_TEXT"
+            android:textColor="@color/c_alert_text"
             android:textDirection="locale"
-            android:textAlignment="viewStart"
-            android:textSize="12sp"
+            android:textSize="12.5sp"
+            android:translationY="-1dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
+            app:layout_constraintStart_toEndOf="@+id/cardView2"
+            app:layout_constraintTop_toTopOf="parent"
             tools:ignore="SmallSp" />
 
         <View
             android:id="@+id/pDivider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="15dp"
             android:background="@color/c_view_divier_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
+            app:layout_constraintTop_toBottomOf="@+id/cardView2" />
 
         <LinearLayout
+            android:id="@+id/pNavigationContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/pNavigationContainer"
+            android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider"
-            android:orientation="vertical">
+            app:layout_constraintTop_toBottomOf="@+id/pDivider">
+
             <LinearLayout
                 android:id="@+id/pOption1"
                 android:layout_width="match_parent"
@@ -101,9 +111,9 @@
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
                     android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
                     android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right" />
+                    app:srcCompat="@xml/ic_arrow_right"
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
@@ -147,9 +157,9 @@
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
                     android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
                     android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right" />
+                    app:srcCompat="@xml/ic_arrow_right"
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
@@ -193,17 +203,17 @@
                     android:layout_weight="1"
                     android:background="@android:color/transparent"
                     android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
                     android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right" />
+                    app:srcCompat="@xml/ic_arrow_right"
+                    app:tint="@color/cursor_blue" />
 
             </LinearLayout>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginEnd="30dp"
                 android:layout_marginStart="30dp"
+                android:layout_marginEnd="30dp"
                 android:background="@color/c_view_divier_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -213,16 +223,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
+                android:paddingBottom="6dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/pDivider">
 
                 <Button
-                        android:id="@+id/pDismiss"
+                    android:id="@+id/pDismiss"
                     android:layout_width="0dp"
                     android:layout_height="45dp"
                     android:layout_weight="1"
-                    android:background="@xml/ax_ripple_default_round_bottom"
+                    android:background="@xml/gx_ripple_gray_bottom"
                     android:padding="0dp"
                     android:text="@string/ALERT_DISMISS"
                     android:textAlignment="center"
diff --git a/app/src/main/res/layouts/alert/layout/popup_welcome.xml b/app/src/main/res/layouts/alert/layout/popup_welcome.xml
deleted file mode 100644
index d8e44667..00000000
--- a/app/src/main/res/layouts/alert/layout/popup_welcome.xml
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/pMainLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@xml/hox_rounded_corner"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/pHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:paddingEnd="15dp"
-            android:paddingStart="15dp"
-            android:text="@string/ALERT_WELCOME_MESSAGE"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_text_setting_heading_v2"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/pDescription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:alpha="0.6"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp"
-            android:text="@string/ALERT_WELCOME_MESSAGE_INFO"
-            android:textAlignment="textStart"
-            android:textColor="@color/c_alert_text"
-            android:textSize="13sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pHeader"
-            tools:ignore="SmallSp" />
-
-        <View
-            android:id="@+id/pDivider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/c_view_divier_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-        <LinearLayout
-            android:id="@+id/pNavigationContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-            <LinearLayout
-                android:id="@+id/pOption1"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@xml/gx_ripple_gray"
-                android:orientation="horizontal"
-                android:weightSum="7"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-                <Button
-                    android:layout_width="0dp"
-                    android:layout_height="45dp"
-                    android:layout_weight="6"
-                    android:alpha="0.7"
-                    android:background="@android:color/transparent"
-                    android:clickable="false"
-                    android:padding="0dp"
-                    android:paddingStart="15dp"
-                    android:text="@string/ALERT_WELCOME_MESSAGE_BT_1"
-                    android:textAlignment="textStart"
-                    android:textAllCaps="false"
-                    android:textColor="@color/c_alert_text"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/transparent"
-                    android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
-                    android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <LinearLayout
-                android:id="@+id/pOption2"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@xml/gx_ripple_gray"
-                android:orientation="horizontal"
-                android:weightSum="7"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-                <Button
-                    android:layout_width="0dp"
-                    android:layout_height="45dp"
-                    android:layout_weight="6"
-                    android:alpha="0.7"
-                    android:background="@android:color/transparent"
-                    android:clickable="false"
-                    android:padding="0dp"
-                    android:paddingStart="15dp"
-                    android:text="@string/ALERT_WELCOME_MESSAGE_BT_2"
-                    android:textAlignment="textStart"
-                    android:textAllCaps="false"
-                    android:textColor="@color/c_alert_text"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/transparent"
-                    android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
-                    android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <LinearLayout
-                android:id="@+id/pOption3"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@xml/gx_ripple_gray"
-                android:orientation="horizontal"
-                android:weightSum="7"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-                <Button
-                    android:layout_width="0dp"
-                    android:layout_height="45dp"
-                    android:layout_weight="6"
-                    android:alpha="0.7"
-                    android:background="@android:color/transparent"
-                    android:clickable="false"
-                    android:padding="0dp"
-                    android:paddingStart="15dp"
-                    android:text="@string/ALERT_WELCOME_MESSAGE_BT_3"
-                    android:textAlignment="textStart"
-                    android:textAllCaps="false"
-                    android:textColor="@color/c_alert_text"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/transparent"
-                    android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
-                    android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <LinearLayout
-                android:id="@+id/pOption4"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@xml/gx_ripple_gray"
-                android:orientation="horizontal"
-                android:weightSum="7"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-                <Button
-                    android:layout_width="0dp"
-                    android:layout_height="45dp"
-                    android:layout_weight="6"
-                    android:alpha="0.7"
-                    android:background="@android:color/transparent"
-                    android:clickable="false"
-                    android:padding="0dp"
-                    android:paddingStart="15dp"
-                    android:text="@string/ALERT_WELCOME_MESSAGE_BT_4"
-                    android:textAlignment="textStart"
-                    android:textAllCaps="false"
-                    android:textColor="@color/c_alert_text"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/transparent"
-                    android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
-                    android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
-
-            </LinearLayout>
-
-            <View
-                android:id="@+id/pDividerHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <LinearLayout
-                android:id="@+id/pOption5"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@xml/gx_ripple_gray"
-                android:orientation="horizontal"
-                android:weightSum="7"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-                <Button
-                    android:layout_width="0dp"
-                    android:layout_height="45dp"
-                    android:layout_weight="6"
-                    android:alpha="0.7"
-                    android:background="@android:color/transparent"
-                    android:clickable="false"
-                    android:padding="0dp"
-                    android:paddingStart="15dp"
-                    android:text="@string/ALERT_WELCOME_MESSAGE_BT_6"
-                    android:textAlignment="textStart"
-                    android:textAllCaps="false"
-                    android:textColor="@color/c_alert_text"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/transparent"
-                    android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
-                    android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <LinearLayout
-                android:id="@+id/pOption6"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@xml/gx_ripple_gray"
-                android:orientation="horizontal"
-                android:weightSum="7"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-                <Button
-                    android:layout_width="0dp"
-                    android:layout_height="45dp"
-                    android:layout_weight="6"
-                    android:alpha="0.7"
-                    android:background="@android:color/transparent"
-                    android:clickable="false"
-                    android:padding="0dp"
-                    android:paddingStart="15dp"
-                    android:text="@string/ALERT_WELCOME_MESSAGE_BT_7"
-                    android:textAlignment="textStart"
-                    android:textAllCaps="false"
-                    android:textColor="@color/c_alert_text"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/transparent"
-                    android:scaleX="0.5"
-                    app:tint="@color/c_navigation_tint"
-                    android:scaleY="0.5"
-                    app:srcCompat="@xml/ic_arrow_right"
-                    android:contentDescription="@string/GENERAL_TODO" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginEnd="30dp"
-                android:layout_marginStart="30dp"
-                android:background="@color/c_view_divier_background"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDescription" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/pDivider">
-
-                <Button
-                    android:id="@+id/pDontShowAgain"
-                    android:layout_width="0dp"
-                    android:layout_height="45dp"
-                    android:layout_weight="1"
-                    android:background="@xml/ax_ripple_default_round_bottom"
-                    android:padding="0dp"
-                    android:text="@string/ALERT_WELCOME_MESSAGE_BT_5"
-                    android:textAlignment="center"
-                    android:textAllCaps="false"
-                    android:textColor="@color/c_button_text_v1"
-                    android:textSize="14sp"
-                    android:textStyle="bold" />
-
-
-            </LinearLayout>
-        </LinearLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
index fe16de87..8bfdc763 100644
--- a/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
+++ b/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
@@ -112,7 +112,7 @@
 
             <ImageButton
                 android:id="@+id/pBookmarkEdit"
-                android:layout_width="60dp"
+                android:layout_width="40dp"
                 android:layout_height="60dp"
                 android:background="@xml/gx_ripple_gray"
                 android:contentDescription="@string/GENERAL_TODO"
diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_setting_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_setting_view.xml
index 6c165f8c..0b7f618b 100644
--- a/app/src/main/res/layouts/bookmark/layout/bookmark_setting_view.xml
+++ b/app/src/main/res/layouts/bookmark/layout/bookmark_setting_view.xml
@@ -6,196 +6,185 @@
     android:background="@color/c_background"
     tools:context="com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings.bookmarkSettingController">
     <ScrollView
+        android:id="@+id/pScrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <LinearLayout
+            android:id="@+id/pScrollContainer"
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <!-- Title Header -->
             <LinearLayout
                 android:id="@+id/pHeaderContainerTop"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
-                android:clickable="true"
-                android:elevation="8dp"
                 android:background="@color/c_background"
-                android:paddingStart="5dp"
-                android:focusable="true"
+                android:elevation="8dp"
                 android:orientation="horizontal"
+                android:paddingStart="5dp"
                 tools:ignore="RtlSymmetry">
 
                 <ImageButton
+                    android:id="@+id/pBack"
                     android:layout_width="45dp"
                     android:layout_height="45dp"
                     android:layout_marginStart="0dp"
                     android:layout_marginTop="1dp"
-                    android:background="@xml/gx_ripple_default_round"
+                    android:background="@xml/bx_ripple_default_round"
                     android:contentDescription="@string/GENERAL_TODO"
-                    android:onClick="onClose"
+                    android:onClick="onCloseTrigger"
                     android:src="@xml/ic_arrow_back"
-                    android:tint="@color/c_navigation_tint" />
+                    app:tint="@color/c_navigation_tint" />
 
                 <TextView
+                    android:id="@+id/pHeaderText"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:onClick="onClose"
                     android:layout_marginTop="-3dp"
                     android:gravity="center_vertical|start"
+                    android:onClick="onCloseTrigger"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
                     android:text="@string/BOOKMARK_SETTING_HEADER"
                     android:textColor="@color/c_text_v1"
                     android:textSize="17sp"
                     android:textStyle="bold" />
 
                 <View
+                    android:id="@+id/pSpace"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
 
                 <ImageView
+                    android:id="@+id/pRemoveBookmark"
                     android:layout_width="44dp"
                     android:layout_height="44dp"
-                    android:padding="8dp"
-                    android:layout_marginEnd="3dp"
                     android:layout_gravity="center_vertical"
-                    android:onClick="onUpdateBookmark"
-                    android:background="@xml/gx_ripple_default_round"
+                    android:layout_marginEnd="3dp"
+                    android:background="@xml/bx_ripple_default_round"
                     android:contentDescription="@string/GENERAL_TODO"
+                    android:onClick="onUITrigger"
+                    android:padding="8dp"
+                    android:src="@xml/ic_baseline_delete"
+                    app:tint="@color/c_header_icon_tint" />
+
+                <View
+                    android:id="@+id/pDivier"
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginEnd="3dp"
+                    android:layout_marginBottom="10dp"
+                    android:background="@color/c_divider_line_light" />
+
+                <ImageView
+                    android:id="@+id/pBookmarkUpdate"
+                    android:layout_width="44dp"
+                    android:layout_height="44dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginEnd="3dp"
+                    android:background="@xml/bx_ripple_default_round"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:onClick="onUITrigger"
+                    android:padding="8dp"
                     android:src="@xml/ic_baseline_done"
-                    app:tint="@color/c_navigation_tint" />
+                    app:tint="@color/c_header_icon_tint" />
 
             </LinearLayout>
 
             <!-- Title Header -->
 
             <View
+                android:id="@+id/pDivider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="@color/c_view_divier_background" />
 
             <TextView
+                android:id="@+id/pFormHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="35dp"
+                android:layout_marginTop="25dp"
                 android:alpha="1"
                 android:background="@android:color/transparent"
                 android:clickable="false"
                 android:padding="0dp"
-                android:textStyle="bold"
                 android:paddingStart="15dp"
                 android:paddingEnd="5dp"
                 android:text="@string/BOOKMARK_SETTING_HEADER_URL"
                 android:textAlignment="textStart"
                 android:textAllCaps="false"
-                android:textColor="@color/c_text_v4"
-                android:textSize="13.5sp"
+                android:textColor="@color/c_text_short_header"
+                android:textSize="15sp"
+                android:textStyle="bold"
+                tools:ignore="RtlSymmetry" />
+
+            <TextView
+                android:id="@+id/pFormDescription"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="2dp"
+                android:layout_marginBottom="10dp"
+                android:alpha="1"
+                android:background="@android:color/transparent"
+                android:clickable="false"
+                android:padding="0dp"
+                android:text="@string/BOOKMARK_SETTING_HEADER_URL_INFO"
+                android:textAlignment="textStart"
+                android:textAllCaps="false"
+                android:textColor="@color/c_text_v2"
+                android:textSize="13sp"
                 tools:ignore="RtlSymmetry" />
 
             <com.darkweb.genesissearchengine.appManager.homeManager.homeController.editTextManager
                 android:id="@+id/pBookmarkName"
                 android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@xml/gx_generic_input"
+                android:layout_height="47dp"
                 android:layout_margin="10dp"
+                android:layout_marginTop="230dp"
+                android:layout_marginEnd="15dp"
+                android:background="@xml/bx_input_field"
+                android:digits="0,1,2,3,4,5,6,7,8,9,*,qwertzuiopa sdfghjklyxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM|+-,_,-"
                 android:fadingEdgeLength="20dp"
                 android:hint="@string/BOOKMARK_SETTING_HEADER_NAME_HINT"
                 android:inputType="text"
-                android:digits="0,1,2,3,4,5,6,7,8,9,*,qwertzuiopa sdfghjklyxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM|+-,_,-"
-                android:maxLines="1"
-                android:paddingStart="18dp"
-                android:paddingEnd="15dp"
                 android:maxLength="100"
-                android:layout_marginTop="5dp"
+                android:maxLines="1"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
                 android:requiresFadingEdge="horizontal"
                 android:text="@string/GENERAL_HOME_URL"
-                android:textColor="@color/c_text_v8"
-                android:textColorHighlight="@color/text_color_highlight_v3"
-                android:textColorHint="@color/c_text_v2"
+                android:textColor="@color/c_text_v1"
+                android:textColorHighlight="@color/c_text_color_highlight_v2"
+                android:textColorHint="@color/c_error_text_color"
                 android:textCursorDrawable="@xml/gx_search_cursor_state"
-                android:textSize="16sp"
-                tools:targetApi="o"/>
+                android:textSize="14sp"
+                tools:targetApi="o" />
 
             <TextView
-                android:id="@+id/pBookmarkNameError"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="15dp"
-                android:textStyle="bold"
-                android:layout_marginTop="-5dp"
-                android:alpha="0"
-                android:background="@android:color/transparent"
-                android:text="@string/BOOKMARK_SETTING_HEADER_NAME_ERROR"
-                android:textAlignment="textStart"
-                android:textColor="@color/dark_red_soft"
-                android:textSize="12sp"
-                tools:ignore="RtlSymmetry" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="15dp"
-                android:layout_marginTop="15dp"
-                android:background="@color/c_view_divier_background" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:alpha="1"
-                android:background="@android:color/transparent"
-                android:clickable="false"
-                android:padding="0dp"
-                android:paddingStart="15dp"
-                android:paddingEnd="5dp"
-                android:text="@string/BOOKMARK_SETTING_HEADER_NAME"
-                android:textAlignment="textStart"
-                android:textStyle="bold"
-                android:textAllCaps="false"
-                android:textColor="@color/c_text_v4"
-                android:textSize="13.5sp"
-                tools:ignore="RtlSymmetry" />
-
-            <com.darkweb.genesissearchengine.appManager.homeManager.homeController.editTextManager
                 android:id="@+id/pBookmarkURL"
                 android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:background="@xml/gx_generic_input"
-                android:layout_margin="10dp"
-                android:fadingEdgeLength="20dp"
-                android:hint="@string/BOOKMARK_SETTING_HEADER_URL_HINT"
-                android:maxLength="350"
-                android:inputType="textWebEmailAddress"
+                android:layout_height="47dp"
+                android:layout_marginStart="11dp"
+                android:layout_marginEnd="11dp"
+                android:background="@xml/bx_form_inactive"
+                android:ellipsize="end"
+                android:gravity="center_vertical | start"
                 android:maxLines="1"
-                android:paddingStart="18dp"
-                android:layout_marginTop="5dp"
+                android:paddingStart="14dp"
                 android:paddingEnd="15dp"
-                android:requiresFadingEdge="horizontal"
-                android:text="@string/GENERAL_HOME_URL"
-                android:textColor="@color/c_text_v8"
-                android:textColorHighlight="@color/text_color_highlight_v3"
-                android:textColorHint="@color/c_text_v2"
-                android:textCursorDrawable="@xml/gx_search_cursor_state"
-                android:textSize="16sp"
-                tools:targetApi="o"/>
+                android:text="@string/GENERAL_TODO"
+                android:textColor="@color/c_text_v2"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/pBookmarkURLError"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="15dp"
-                android:layout_marginTop="-5dp"
-                android:alpha="0"
-                android:background="@android:color/transparent"
-                android:text="@string/BOOKMARK_SETTING_HEADER_URL_ERROR"
-                android:textAlignment="textStart"
-                android:textColor="@color/dark_red_soft"
-                android:textSize="12sp"
-                android:textStyle="bold"
-                tools:ignore="RtlSymmetry" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
index fab6e8a7..702d692a 100644
--- a/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
+++ b/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml
@@ -72,7 +72,7 @@
                 android:paddingStart="11dp"
                 android:paddingEnd="8dp"
                 android:textColor="@color/c_text_v1"
-                android:textColorHighlight="@color/text_color_highlight_v1"
+                android:textColorHighlight="@color/c_text_color_highlight_v1"
                 android:textColorHint="@color/c_text_v2"
                 android:textCursorDrawable="@xml/gx_search_cursor_state"
                 android:textSize="15sp"
@@ -158,7 +158,7 @@
                     android:stateListAnimator="@null"
                     android:text="@string/BOOKMARK_CLEAR"
                     android:textAlignment="textStart"
-                    android:textColor="@color/c_text_setting_heading"
+                    android:textColor="@color/c_text_short_header"
 
                     android:textSize="14sp"
                     android:textStyle="bold"
@@ -178,18 +178,22 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <ImageView
+    <TextView
         android:id="@+id/pEmptyListNotification"
-        android:layout_width="130dp"
-        android:layout_height="130dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="70dp"
+        android:layout_marginEnd="15dp"
         android:alpha="0"
-        android:contentDescription="@string/GENERAL_TODO"
-        android:src="@drawable/empty_bookmark"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@xml/hx_ripple_default_round_bottom"
+        android:gravity="center"
+        android:text="@string/BOOKMARK_EMPTY"
+        android:textColor="@color/c_text_v8"
+        android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/c_text_v3" />
+        app:layout_constraintTop_toBottomOf="@+id/pHeaderContainer" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
index 552f0fae..a2698ba1 100644
--- a/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
+++ b/app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
@@ -32,7 +32,7 @@
                 <ImageButton
                     android:layout_width="45dp"
                     android:layout_height="50dp"
-                    android:onClick="onClose"
+                    android:onClick="onCloseTrigger"
                     android:layout_marginTop="3dp"
                     android:layout_marginStart="3dp"
                     android:tint="@color/c_navigation_tint"
@@ -41,7 +41,7 @@
                     android:contentDescription="@string/GENERAL_TODO"/>
                 <TextView
                     android:textColor="@color/c_text_v1"
-                    android:onClick="onClose"
+                    android:onClick="onCloseTrigger"
                     android:textSize="17sp"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
@@ -67,7 +67,7 @@
                     android:background="@xml/gx_ripple_gray_round_left"
                     android:contentDescription="@string/GENERAL_TODO"
                     android:src="@xml/ic_info"
-                    app:tint="@color/c_icon_tint_light" />
+                    app:tint="@color/c_header_icon_tint" />
 
             </LinearLayout>
 
@@ -107,7 +107,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="40"
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:layout_marginStart="15dp"
                         android:textStyle="bold"
                         android:text="@string/BRIDGE_AUTO"
@@ -215,7 +215,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginStart="4dp"
-                        android:background="@color/c_view_divier_background_inner"/>
+                        android:background="@color/c_topbar_divider"/>
 
                     <LinearLayout
                         android:id="@+id/pOption2"
@@ -270,7 +270,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginStart="4dp"
-                        android:background="@color/c_view_divier_background_inner"/>
+                        android:background="@color/c_topbar_divider"/>
 
                     <LinearLayout
                         android:id="@+id/pOption3"
@@ -326,7 +326,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:elevation="4dp"
-                        android:background="@color/c_view_divier_background_inner"/>
+                        android:background="@color/c_topbar_divider"/>
 
                 </LinearLayout>
 
@@ -349,7 +349,7 @@
                     tools:ignore="RtlSymmetry">
                     <EditText
                         android:background="@xml/gx_generic_input"
-                        android:textColorHighlight="@color/text_color_highlight_v1"
+                        android:textColorHighlight="@color/c_text_color_highlight_v1"
                         android:textCursorDrawable="@xml/gx_search_cursor_state"
                         android:id="@+id/pCustomPort"
                         android:layout_width="0dp"
diff --git a/app/src/main/res/layouts/help/layout/help_view.xml b/app/src/main/res/layouts/help/layout/help_view.xml
index 11a6a778..2a4d2cb6 100644
--- a/app/src/main/res/layouts/help/layout/help_view.xml
+++ b/app/src/main/res/layouts/help/layout/help_view.xml
@@ -120,7 +120,7 @@
             android:layout_marginTop="1dp"
             android:background="@xml/gx_ripple_default_round"
             android:contentDescription="@string/GENERAL_TODO"
-            android:onClick="onClose"
+            android:onClick="onCloseTrigger"
             android:src="@xml/ic_arrow_back"
             android:tint="@color/c_navigation_tint" />
 
@@ -130,7 +130,7 @@
             android:layout_marginTop="-3dp"
             android:layout_marginEnd="10dp"
             android:gravity="center_vertical|start"
-            android:onClick="onClose"
+            android:onClick="onCloseTrigger"
             android:text="@string/HELP_TITLE"
             android:textColor="@color/c_text_v1"
             android:textSize="17sp"
@@ -152,7 +152,7 @@
             android:onClick="onOpenHelp"
             android:padding="9dp"
             android:src="@xml/ic_baseline_chat"
-            app:tint="@color/c_icon_tint_light" />
+            app:tint="@color/c_header_icon_tint" />
 
     </LinearLayout>
 
@@ -195,7 +195,7 @@
                 android:paddingStart="15dp"
                 android:paddingEnd="8dp"
                 android:textColor="@color/c_text_v1"
-                android:textColorHighlight="@color/text_color_highlight_v1"
+                android:textColorHighlight="@color/c_text_color_highlight_v1"
                 android:textColorHint="@color/c_text_v2"
                 android:textCursorDrawable="@xml/gx_search_cursor_state"
                 android:textSize="15sp"
diff --git a/app/src/main/res/layouts/history/layout/history_view.xml b/app/src/main/res/layouts/history/layout/history_view.xml
index 6668e1cc..17958522 100644
--- a/app/src/main/res/layouts/history/layout/history_view.xml
+++ b/app/src/main/res/layouts/history/layout/history_view.xml
@@ -72,7 +72,7 @@
                 android:paddingStart="11dp"
                 android:paddingEnd="8dp"
                 android:textColor="@color/c_text_v1"
-                android:textColorHighlight="@color/text_color_highlight_v1"
+                android:textColorHighlight="@color/c_text_color_highlight_v1"
                 android:textColorHint="@color/c_text_v2"
                 android:textCursorDrawable="@xml/gx_search_cursor_state"
                 android:textSize="15sp"
@@ -158,7 +158,7 @@
                     android:stateListAnimator="@null"
                     android:text="@string/HISTORY_CLEAR"
                     android:textAlignment="textStart"
-                    android:textColor="@color/c_text_setting_heading"
+                    android:textColor="@color/c_text_short_header"
 
                     android:textSize="14sp"
                     android:textStyle="bold"
@@ -183,18 +183,22 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <ImageView
+    <TextView
         android:id="@+id/pEmptyListNotification"
-        android:layout_width="130dp"
-        android:layout_height="130dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="7dp"
+        android:layout_marginEnd="15dp"
         android:alpha="0"
-        android:contentDescription="@string/GENERAL_TODO"
-        android:src="@drawable/empty_history"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@xml/hx_ripple_default_round_bottom"
+        android:gravity="center"
+        android:text="@string/HISTORY_EMPTY"
+        android:textColor="@color/c_text_v8"
+        android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/c_text_v3" />
+        app:layout_constraintTop_toBottomOf="@+id/pHeaderContainer" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/home/layout/home_view.xml b/app/src/main/res/layouts/home/layout/home_view.xml
index c694f212..71dc95ea 100644
--- a/app/src/main/res/layouts/home/layout/home_view.xml
+++ b/app/src/main/res/layouts/home/layout/home_view.xml
@@ -129,7 +129,7 @@
                             android:selectAllOnFocus="true"
                             android:text="@string/GENERAL_HOME_URL"
                             android:textColor="@color/c_text_v1"
-                            android:textColorHighlight="@color/text_color_highlight_v3"
+                            android:textColorHighlight="@color/c_text_color_highlight_v2"
                             android:textColorHint="@color/c_text_v2"
                             android:textCursorDrawable="@xml/gx_search_cursor_state"
                             android:textIsSelectable="false"
@@ -210,33 +210,18 @@
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <!-- Live Build -->
-                <com.google.android.gms.ads.AdView
+                <com.mopub.mobileads.MoPubView
                     android:id="@+id/pAdView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_width='320dp'
+                    android:layout_height='50dp'
                     android:alpha="0"
                     android:background="@color/c_border_background_divider"
                     android:visibility="gone"
-                    app:adSize="BANNER"
-                    app:adUnitId="ca-app-pub-5074525529134731/7227708311"
+                    app:moPubAdSize='match_view'
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/pTopbar" />
 
-                <!-- Development Build
-                <com.google.android.gms.ads.AdView
-                    android:id="@+id/pAdView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0"
-                    android:background="@color/c_border_background_divider"
-                    android:visibility="gone"
-                    app:adSize="BANNER"
-                    app:adUnitId="ca-app-pub-6985886044951738/2630126403"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/pTopbar" /> -->
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
@@ -802,28 +787,7 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
-
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/pFloatingLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="24dp"
-        android:alpha="0"
-        android:backgroundTint="@color/white"
-        android:clickable="true"
-        android:contentDescription="@string/GENERAL_TODO"
-        android:focusable="true"
-        android:src="@drawable/icon_ban"
-        android:visibility="gone"
-        app:borderWidth="0dp"
-        app:elevation="10dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="?attr/actionModeSelectAllDrawable"
-        tools:ignore="ExtraText" />
-
+    
     <include
         android:id="@+id/pFindBar"
         layout="@layout/popup_find"
diff --git a/app/src/main/res/layouts/home/layout/popup_side_menu.xml b/app/src/main/res/layouts/home/layout/popup_side_menu.xml
index f87100ed..32dbdbbd 100644
--- a/app/src/main/res/layouts/home/layout/popup_side_menu.xml
+++ b/app/src/main/res/layouts/home/layout/popup_side_menu.xml
@@ -52,6 +52,19 @@
                     android:src="@xml/ic_home"
                     android:tint="@color/c_navigation_tint" />
 
+                <ImageButton
+                    android:id="@+id/menu23"
+                    android:layout_width="wrap_content"
+                    android:layout_height="47dp"
+                    android:layout_weight="1"
+                    android:background="@xml/gx_ripple_gray"
+                    android:contentDescription="@string/GENERAL_TODO"
+                    android:onClick="onMenuItemInvoked"
+                    android:scaleX="0.96"
+                    android:scaleY="0.96"
+                    android:src="@xml/ic_baseline_bookmark"
+                    android:tint="@color/c_navigation_tint" />
+
                 <ImageButton
                     android:id="@+id/menu22"
                     android:layout_width="wrap_content"
@@ -65,19 +78,6 @@
                     android:src="@xml/ic_arrow_right"
                     android:tint="@color/c_navigation_tint" />
 
-                <ImageButton
-                    android:id="@+id/menu23"
-                    android:layout_width="wrap_content"
-                    android:layout_height="47dp"
-                    android:layout_weight="1"
-                    android:scaleX="0.96"
-                    android:scaleY="0.96"
-                    android:background="@xml/gx_ripple_gray"
-                    android:contentDescription="@string/GENERAL_TODO"
-                    android:onClick="onMenuItemInvoked"
-                    android:src="@xml/ic_baseline_bookmark"
-                    android:tint="@color/c_navigation_tint" />
-
                 <ImageButton
                     android:id="@+id/menuItem25"
                     android:layout_width="wrap_content"
@@ -87,6 +87,7 @@
                     android:contentDescription="@string/GENERAL_TODO"
                     android:onClick="onMenuItemInvoked"
                     android:scaleX="0.96"
+                    android:paddingTop="1.5dp"
                     android:scaleY="0.96"
                     android:src="@xml/ic_baseline_file_download"
                     android:tint="@color/c_navigation_tint" />
diff --git a/app/src/main/res/layouts/language/layout/language_view.xml b/app/src/main/res/layouts/language/layout/language_view.xml
index 3321a073..93165c5d 100644
--- a/app/src/main/res/layouts/language/layout/language_view.xml
+++ b/app/src/main/res/layouts/language/layout/language_view.xml
@@ -31,7 +31,7 @@
             android:layout_marginTop="1dp"
             android:background="@xml/gx_ripple_default_round"
             android:contentDescription="@string/GENERAL_TODO"
-            android:onClick="onClose"
+            android:onClick="onCloseTrigger"
             android:src="@xml/ic_arrow_back"
             android:tint="@color/c_navigation_tint" />
 
@@ -40,7 +40,7 @@
             android:layout_height="match_parent"
             android:layout_marginTop="-3dp"
             android:gravity="center_vertical|start"
-            android:onClick="onClose"
+            android:onClick="onCloseTrigger"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
             android:text="@string/LANGUAGE_TITLE"
@@ -63,7 +63,7 @@
             android:background="@xml/gx_ripple_gray_round_left"
             android:contentDescription="@string/GENERAL_TODO"
             android:src="@xml/ic_info"
-            app:tint="@color/c_icon_tint_light" />
+            app:tint="@color/c_header_icon_tint" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml b/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
index 2dbe3238..caa54279 100644
--- a/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
+++ b/app/src/main/res/layouts/orbot/layout/orbot_settings_view.xml
@@ -25,7 +25,7 @@
                 <ImageButton
                     android:layout_width="45dp"
                     android:layout_height="45dp"
-                    android:onClick="onClose"
+                    android:onClick="onCloseTrigger"
                     android:layout_marginTop="3dp"
                     android:layout_marginStart="3dp"
                     android:tint="@color/c_navigation_tint"
@@ -34,7 +34,7 @@
                     android:contentDescription="@string/GENERAL_TODO"/>
                 <TextView
                         android:textColor="@color/c_text_v1"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:textSize="17sp"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
@@ -59,7 +59,7 @@
                     android:background="@xml/gx_ripple_gray_round_left"
                     android:contentDescription="@string/GENERAL_TODO"
                     android:src="@xml/ic_info"
-                    app:tint="@color/c_icon_tint_light" />
+                    app:tint="@color/c_header_icon_tint" />
 
             </LinearLayout>
 
@@ -71,7 +71,7 @@
                     android:orientation="horizontal"
                     android:layout_height="40dp">
                 <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="16sp"
                         android:layout_width="0dp"
                         android:paddingEnd="15dp"
diff --git a/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml b/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
index 73f20648..46271d15 100644
--- a/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
+++ b/app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
@@ -27,7 +27,7 @@
             android:layout_marginTop="1dp"
             android:background="@xml/gx_ripple_default_round"
             android:contentDescription="@string/GENERAL_TODO"
-            android:onClick="onClose"
+            android:onClick="onCloseTrigger"
             android:src="@xml/ic_arrow_back"
             android:tint="@color/c_navigation_tint" />
 
@@ -36,7 +36,7 @@
             android:layout_height="match_parent"
             android:layout_marginTop="-3dp"
             android:gravity="center_vertical|start"
-            android:onClick="onClose"
+            android:onClick="onCloseTrigger"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
             android:text="@string/ORBOT_LOG"
@@ -59,7 +59,7 @@
             android:contentDescription="@string/GENERAL_TODO"
             android:onClick="onOpenInfo"
             android:src="@xml/ic_gear"
-            app:tint="@color/c_icon_tint_light" />
+            app:tint="@color/c_header_icon_tint" />
 
     </LinearLayout>
 
@@ -96,7 +96,7 @@
                     android:layout_marginTop="10dp"
                     android:layout_weight="40"
                     android:text="@string/ORBOT_LOG_HEADER"
-                    android:textColor="@color/c_text_setting_heading"
+                    android:textColor="@color/c_text_short_header"
                     android:textSize="16sp"
                     android:textStyle="bold" />
             </LinearLayout>
diff --git a/app/src/main/res/layouts/orbotLog/layout/orbot_row_view.xml b/app/src/main/res/layouts/orbotLog/layout/orbot_row_view.xml
index 5c5d33bf..5e8fd8d8 100644
--- a/app/src/main/res/layouts/orbotLog/layout/orbot_row_view.xml
+++ b/app/src/main/res/layouts/orbotLog/layout/orbot_row_view.xml
@@ -76,7 +76,7 @@
                     android:ellipsize="end"
                     android:src="@xml/ic_baseline_clock"
                     android:textColor="@color/c_text_v1"
-                    app:tint="@color/c_view_divier_background_inner_v1" />
+                    app:tint="@color/c_divider_line_light" />
 
                 <TextView
                     android:id="@+id/pDescription"
diff --git a/app/src/main/res/layouts/proxyStatus/layout/proxy_status_view.xml b/app/src/main/res/layouts/proxyStatus/layout/proxy_status_view.xml
index c34fb43b..516ddd3b 100644
--- a/app/src/main/res/layouts/proxyStatus/layout/proxy_status_view.xml
+++ b/app/src/main/res/layouts/proxyStatus/layout/proxy_status_view.xml
@@ -26,7 +26,7 @@
                 <ImageButton
                     android:layout_width="45dp"
                     android:layout_height="45dp"
-                    android:onClick="onClose"
+                    android:onClick="onCloseTrigger"
                     android:layout_marginTop="3dp"
                     android:layout_marginStart="3dp"
                     android:tint="@color/c_navigation_tint"
@@ -35,7 +35,7 @@
                     android:contentDescription="@string/GENERAL_TODO"/>
                 <TextView
                         android:textColor="@color/c_text_v1"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:textSize="17sp"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
@@ -63,7 +63,7 @@
                     android:background="@xml/gx_ripple_default_round"
                     android:contentDescription="@string/GENERAL_TODO"
                     android:src="@xml/ic_baseline_refresh"
-                    app:tint="@color/c_icon_tint_light" />
+                    app:tint="@color/c_header_icon_tint" />
 
                 <ImageButton
                     android:id="@+id/imageView4"
@@ -78,7 +78,7 @@
                     android:scaleX="1.2"
                     android:scaleY="1.2"
                     android:src="@xml/ic_baseline_bug"
-                    app:tint="@color/c_icon_tint_light" />
+                    app:tint="@color/c_header_icon_tint" />
 
             </LinearLayout>
 
@@ -90,7 +90,7 @@
                     android:orientation="horizontal"
                     android:layout_height="40dp">
                 <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="16sp"
                         android:layout_width="0dp"
                         android:textStyle="bold"
diff --git a/app/src/main/res/layouts/setting/layout/setting.xml b/app/src/main/res/layouts/setting/layout/setting.xml
index a9a153fa..b32eaf3d 100644
--- a/app/src/main/res/layouts/setting/layout/setting.xml
+++ b/app/src/main/res/layouts/setting/layout/setting.xml
@@ -68,7 +68,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml b/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml
index a927e7e8..0f55ac15 100644
--- a/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_accessibility_view.xml
@@ -36,7 +36,7 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:src="@xml/ic_arrow_back"
                         android:tint="@color/c_navigation_tint" />
 
@@ -46,7 +46,7 @@
                         android:layout_marginTop="-3dp"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_ACCESSIBILITY_HEADER"
                         android:textColor="@color/c_text_v1"
@@ -67,7 +67,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
@@ -87,7 +87,7 @@
                         android:layout_marginTop="00dp"
                         android:layout_weight="40"
                         android:text="@string/SETTING_ACCESSIBILITY_FONT"
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:textStyle="bold" />
                 </LinearLayout>
@@ -203,7 +203,7 @@
                     android:orientation="vertical"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="match_parent"
                         android:textStyle="bold"
diff --git a/app/src/main/res/layouts/setting/layout/setting_advance_view.xml b/app/src/main/res/layouts/setting/layout/setting_advance_view.xml
index c417f2ce..dbeb40c1 100644
--- a/app/src/main/res/layouts/setting/layout/setting_advance_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_advance_view.xml
@@ -36,7 +36,7 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:src="@xml/ic_arrow_back"
                         android:tint="@color/c_navigation_tint" />
 
@@ -45,7 +45,7 @@
                         android:layout_height="match_parent"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
                         android:text="@string/SETTING_ADVANCE_HEADER"
@@ -67,7 +67,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
@@ -86,7 +86,7 @@
                         android:layout_marginTop="00dp"
                         android:layout_weight="40"
                         android:text="@string/SETTING_ADVANCE_TAB"
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:textStyle="bold" />
 
@@ -243,7 +243,7 @@
                     android:orientation="vertical"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="match_parent"
                         android:textStyle="bold"
@@ -338,7 +338,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginStart="4dp"
-                        android:background="@color/c_view_divier_background_inner" />
+                        android:background="@color/c_topbar_divider" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -390,7 +390,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:elevation="4dp"
-                        android:background="@color/c_view_divier_background_inner"/>
+                        android:background="@color/c_topbar_divider"/>
 
                 </LinearLayout>
 
@@ -407,7 +407,7 @@
                     android:orientation="vertical"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="match_parent"
                         android:textStyle="bold"
@@ -502,7 +502,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginStart="4dp"
-                        android:background="@color/c_view_divier_background_inner" />
+                        android:background="@color/c_topbar_divider" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -554,7 +554,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:elevation="4dp"
-                        android:background="@color/c_view_divier_background_inner"/>
+                        android:background="@color/c_topbar_divider"/>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting_clear_view.xml b/app/src/main/res/layouts/setting/layout/setting_clear_view.xml
index 3ea8c793..0bbc0385 100644
--- a/app/src/main/res/layouts/setting/layout/setting_clear_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_clear_view.xml
@@ -37,7 +37,7 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:src="@xml/ic_arrow_back"
                         android:tint="@color/c_navigation_tint" />
 
@@ -47,7 +47,7 @@
                         android:layout_marginTop="-3dp"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_CLEAR_HEADER"
                         android:textColor="@color/c_text_v1"
@@ -68,7 +68,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting_general_view.xml b/app/src/main/res/layouts/setting/layout/setting_general_view.xml
index b45e5060..f0f9425d 100644
--- a/app/src/main/res/layouts/setting/layout/setting_general_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_general_view.xml
@@ -35,7 +35,7 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:src="@xml/ic_arrow_back"
                         android:tint="@color/c_navigation_tint" />
 
@@ -44,7 +44,7 @@
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_GENERAL_HEADER"
@@ -66,7 +66,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
@@ -77,7 +77,7 @@
                     android:orientation="horizontal"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="0dp"
                         android:textStyle="bold"
@@ -203,7 +203,7 @@
                     android:orientation="horizontal"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="0dp"
                         android:textStyle="bold"
@@ -314,7 +314,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginStart="4dp"
-                        android:background="@color/c_view_divier_background_inner"/>
+                        android:background="@color/c_topbar_divider"/>
 
                     <LinearLayout
                         android:id="@+id/pOption2"
@@ -371,7 +371,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginStart="4dp"
-                        android:background="@color/c_view_divier_background_inner"/>
+                        android:background="@color/c_topbar_divider"/>
 
                     <LinearLayout
                         android:id="@+id/pOption3"
@@ -429,7 +429,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:elevation="4dp"
-                        android:background="@color/c_view_divier_background_inner"/>
+                        android:background="@color/c_topbar_divider"/>
 
                 </LinearLayout>
 
@@ -440,7 +440,7 @@
                     android:orientation="vertical"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="match_parent"
                         android:textStyle="bold"
diff --git a/app/src/main/res/layouts/setting/layout/setting_log_view.xml b/app/src/main/res/layouts/setting/layout/setting_log_view.xml
index 86fc124c..843302df 100644
--- a/app/src/main/res/layouts/setting/layout/setting_log_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_log_view.xml
@@ -34,7 +34,7 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:src="@xml/ic_arrow_back"
                         android:tint="@color/c_navigation_tint" />
 
@@ -43,7 +43,7 @@
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_ORBOT_LOG_HEADER"
@@ -65,7 +65,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting_notification_view.xml b/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
index 0c461657..bd1526c0 100644
--- a/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_notification_view.xml
@@ -35,7 +35,7 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:src="@xml/ic_arrow_back"
                         android:tint="@color/c_navigation_tint" />
 
@@ -44,7 +44,7 @@
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_NOTIFICATION_HEADER"
@@ -66,7 +66,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
@@ -80,7 +80,7 @@
                     android:orientation="vertical"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="match_parent"
                         android:textStyle="bold"
diff --git a/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml b/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
index abf9c4ea..c2eba274 100644
--- a/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
@@ -35,7 +35,7 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:src="@xml/ic_arrow_back"
                         android:tint="@color/c_navigation_tint" />
 
@@ -44,7 +44,7 @@
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_PRIVACY_HEADER"
@@ -66,7 +66,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
@@ -79,7 +79,7 @@
                     android:orientation="vertical"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="match_parent"
                         android:textStyle="bold"
@@ -535,7 +535,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="1dp"
                                 android:layout_marginStart="4dp"
-                                android:background="@color/c_view_divier_background_inner"/>
+                                android:background="@color/c_topbar_divider"/>
 
                             <LinearLayout
                                 android:id="@+id/pCookieOption2"
@@ -568,7 +568,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="1dp"
                                 android:layout_marginStart="4dp"
-                                android:background="@color/c_view_divier_background_inner"/>
+                                android:background="@color/c_topbar_divider"/>
 
                             <LinearLayout
                                 android:id="@+id/pCookieOption3"
@@ -601,7 +601,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="1dp"
                                 android:layout_marginStart="4dp"
-                                android:background="@color/c_view_divier_background_inner"/>
+                                android:background="@color/c_topbar_divider"/>
 
                             <LinearLayout
                                 android:id="@+id/pCookieOption4"
@@ -632,7 +632,7 @@
                                 android:layout_height="1dp"
                                 android:elevation="4dp"
                                 android:layout_marginTop="0.5dp"
-                                android:background="@color/c_view_divier_background_inner"/>
+                                android:background="@color/c_topbar_divider"/>
 
                         </LinearLayout>
 
diff --git a/app/src/main/res/layouts/setting/layout/setting_search_view.xml b/app/src/main/res/layouts/setting/layout/setting_search_view.xml
index b3d66814..be99f7c9 100644
--- a/app/src/main/res/layouts/setting/layout/setting_search_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_search_view.xml
@@ -36,7 +36,7 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:src="@xml/ic_arrow_back"
                         android:tint="@color/c_navigation_tint"
                         />
@@ -46,7 +46,7 @@
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_SEARCH_HEADER"
@@ -68,7 +68,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
@@ -81,7 +81,7 @@
                     android:orientation="vertical"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="match_parent"
                         android:textStyle="bold"
@@ -509,7 +509,7 @@
                     android:orientation="vertical"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="match_parent"
                         android:textStyle="bold"
diff --git a/app/src/main/res/layouts/setting/layout/setting_tracking_view.xml b/app/src/main/res/layouts/setting/layout/setting_tracking_view.xml
index 512de283..9530ba92 100644
--- a/app/src/main/res/layouts/setting/layout/setting_tracking_view.xml
+++ b/app/src/main/res/layouts/setting/layout/setting_tracking_view.xml
@@ -35,7 +35,7 @@
                         android:layout_marginTop="1dp"
                         android:background="@xml/gx_ripple_default_round"
                         android:contentDescription="@string/GENERAL_TODO"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:src="@xml/ic_arrow_back"
                         android:tint="@color/c_navigation_tint" />
 
@@ -44,7 +44,7 @@
                         android:layout_height="match_parent"
                         android:paddingStart="10dp"
                         android:paddingEnd="10dp"
-                        android:onClick="onClose"
+                        android:onClick="onCloseTrigger"
                         android:layout_marginTop="-3dp"
                         android:gravity="center_vertical|start"
                         android:text="@string/SETTING_TRACKING_HEADER"
@@ -66,7 +66,7 @@
                         android:background="@xml/gx_ripple_gray_round_left"
                         android:contentDescription="@string/GENERAL_TODO"
                         android:src="@xml/ic_info"
-                        app:tint="@color/c_icon_tint_light" />
+                        app:tint="@color/c_header_icon_tint" />
 
                 </LinearLayout>
 
@@ -79,7 +79,7 @@
                     android:orientation="vertical"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:textColor="@color/c_text_setting_heading"
+                        android:textColor="@color/c_text_short_header"
                         android:textSize="15sp"
                         android:layout_width="match_parent"
                         android:textStyle="bold"
@@ -200,7 +200,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="1dp"
                                 android:layout_marginStart="4dp"
-                                android:background="@color/c_view_divier_background_inner"/>
+                                android:background="@color/c_topbar_divider"/>
 
                             <LinearLayout
                                 android:id="@+id/pTrackingOption2"
@@ -263,7 +263,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="1dp"
                                 android:layout_marginStart="4dp"
-                                android:background="@color/c_view_divier_background_inner"/>
+                                android:background="@color/c_topbar_divider"/>
 
                             <LinearLayout
                                 android:id="@+id/pTrackingOption3"
@@ -327,7 +327,7 @@
                                 android:layout_height="1dp"
                                 android:elevation="4dp"
                                 android:layout_marginTop="0.5dp"
-                                android:background="@color/c_view_divier_background_inner"/>
+                                android:background="@color/c_topbar_divider"/>
 
                         </LinearLayout>
 
diff --git a/app/src/main/res/layouts/shared/listviews/layout/history_bookmark__row_menu.xml b/app/src/main/res/layouts/shared/listviews/layout/history_bookmark__row_menu.xml
index f51daf2f..1300a28c 100644
--- a/app/src/main/res/layouts/shared/listviews/layout/history_bookmark__row_menu.xml
+++ b/app/src/main/res/layouts/shared/listviews/layout/history_bookmark__row_menu.xml
@@ -93,7 +93,7 @@
                     android:layout_height="45dp"
                     android:background="@xml/gx_side_item_bottom"
                     android:gravity="start|center_vertical"
-                    android:textColor="@color/dark_red_soft"
+                    android:textColor="@color/c_error_text_color"
                     android:paddingStart="15dp"
                     android:paddingEnd="15dp"
                     android:textAllCaps="false"
diff --git a/app/src/main/res/layouts/shared/listviews/layout/history_bookmark_menu.xml b/app/src/main/res/layouts/shared/listviews/layout/history_bookmark_menu.xml
index b77bced9..5cf197ff 100644
--- a/app/src/main/res/layouts/shared/listviews/layout/history_bookmark_menu.xml
+++ b/app/src/main/res/layouts/shared/listviews/layout/history_bookmark_menu.xml
@@ -84,7 +84,7 @@
                     android:layout_height="45dp"
                     android:background="@xml/gx_side_item_bottom"
                     android:gravity="start|center_vertical"
-                    android:textColor="@color/dark_red_soft"
+                    android:textColor="@color/c_error_text_color"
                     android:paddingStart="15dp"
                     android:onClick="onDeleteSelected"
                     android:paddingEnd="15dp"
diff --git a/app/src/main/res/layouts/tab/layout/tab_grid_view.xml b/app/src/main/res/layouts/tab/layout/tab_grid_view.xml
index 41e83363..b5258a3c 100644
--- a/app/src/main/res/layouts/tab/layout/tab_grid_view.xml
+++ b/app/src/main/res/layouts/tab/layout/tab_grid_view.xml
@@ -210,7 +210,7 @@
                 android:id="@+id/pBorder"
                 android:layout_width="30dp"
                 android:layout_height="12dp"
-                android:background="@color/c_view_divier_background_inner"
+                android:background="@color/c_topbar_divider"
                 android:contentDescription="@string/GENERAL_TODO"
                 android:layout_gravity="end"
                 android:visibility="visible" />
diff --git a/app/src/main/res/layouts/tab/layout/tab_view.xml b/app/src/main/res/layouts/tab/layout/tab_view.xml
index 18f6fe8e..be39b1f0 100644
--- a/app/src/main/res/layouts/tab/layout/tab_view.xml
+++ b/app/src/main/res/layouts/tab/layout/tab_view.xml
@@ -138,7 +138,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/c_view_divier_background_inner"
+            android:background="@color/c_topbar_divider"
             android:paddingStart="10dp"
             android:paddingEnd="10dp" />
     </LinearLayout>
@@ -177,14 +177,18 @@
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
-                android:id="@+id/pEmptyView"
+                android:id="@+id/pURL"
                 android:layout_width="match_parent"
-                android:layout_height="150dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="15dp"
                 android:gravity="center"
+                android:layout_marginTop="70dp"
                 android:text="@string/HOME_TAB_EMPTY"
                 android:textColor="@color/c_text_v2"
                 android:textSize="15sp"
                 android:textStyle="bold"
+                android:background="@xml/hx_ripple_default_round_bottom"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 51660572..f583476c 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,6 +1,22 @@
 <resources>
 
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Edita El Marcador</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">URL Del Marcador</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">L\'URL del marcador es mostrarà aquí</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Nom Del Marcador</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">El nom de l\'URL marcat es mostrarà aquí</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Introduïu el nom del marcador ...</string>
+
+
+
+
+
+
+
+
+
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
 	<string name="app_name" translatable="false">Genesis</string>
diff --git a/app/src/main/res/values-ch/strings.xml b/app/src/main/res/values-ch/strings.xml
index f29eefc1..1f0890e1 100644
--- a/app/src/main/res/values-ch/strings.xml
+++ b/app/src/main/res/values-ch/strings.xml
@@ -1,6 +1,19 @@
 <resources>
 
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Upravit Záložku</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">URL Záložky</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">URL záložky se zobrazí zde</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Název Záložky</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Název záložky url se zobrazí zde</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Zadejte název záložky…</string>
+
+
+
+
+
+
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
 	<string name="app_name" translatable="false">Genesis</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9bc8a143..779344ee 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,18 @@
 <resources>
 
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Lesezeichen Bearbeiten</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">Lesezeichen-URL</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">Lesezeichen-URL wird hier angezeigt</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Lesezeichenname</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Der Name der mit einem Lesezeichen versehenen URL wird hier angezeigt</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Lesezeichennamen eingeben…</string>
+
+
+
+
+
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
 	<string name="app_name" translatable="false">Genesis</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 054239a4..3e4fca3a 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,5 +1,16 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Επεξεργασία σελιδοδείκτη</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">Διεύθυνση URL σελιδοδείκτη</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">Η διεύθυνση URL του σελιδοδείκτη θα εμφανίζεται εδώ</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Όνομα σελιδοδείκτη</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Το όνομα του σελιδοδείκτη url θα εμφανίζεται εδώ</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Εισαγάγετε το όνομα σελιδοδείκτη…</string>
+
+
+
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ff14f177..871b17bf 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,17 @@
 <resources>
 
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Modifier Le Signet</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">URL De Signet</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">L\'URL du signet s\'affichera ici</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Nom Du Signet</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Le nom de l\'url mis en signet s\'affichera ici</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Saisissez le nom du signet…</string>
+
+
+
+
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
 	<string name="app_name" translatable="false">Genesis</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 308dbdda..46133c40 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,5 +1,14 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Könyvjelző Szerkesztése</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">Könyvjelző URL</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">A könyvjelző URL itt jelenik meg Könyvjelző neve</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">A Könyvjelzővel Ellátott URL Neve Itt Jelenik Meg Írja Be A Könyvjelző Nevét…</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Name of bookmarked url will show here</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Enter bookmark name…</string>
+
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 7eb9a771..8968083d 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -1,5 +1,13 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Bladwijzer Bewerken</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">Bladwijzer-URL</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">De bladwijzer-URL wordt hier weergegeven</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Naam Bladwijzer</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">De naam van de url met bladwijzer wordt hier weergegeven</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Voer de naam van de bladwijzer in...</string>
+
 	<!-- Application Strings -->
 	<string name="GENERAL_SEARCH_HINT" translatable="true">zoek iets of typ een weblink</string>
 	<string name="GENERAL_FIND_HINT" translatable="true">vind op pagina</string>
@@ -411,6 +419,9 @@
 		<item>Allow Visited</item>
 		<item>Allow Non Tracker</item>
 	</string-array>
+    <string name="BRIDGE_MEEK" translatable="false">meek-azure (china)</string>
+	<string name="HOME_LOADING" translatable="false">Genesis is paused at the moment</string>
+	<string name="HOME_LOADING_STATIC" translatable="false">~ Genesis on standby at the moment</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8e0c0073..03650628 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,5 +1,15 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Modifica Segnalibro</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">URL Segnalibro</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">L\'URL del segnalibro verrà mostrato qui</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Nome Segnalibro</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Il nome dell\'URL aggiunto ai segnalibri verrà mostrato qui</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Inserisci il nome del segnalibro...</string>
+
+
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 744d8dd0..5b980bf8 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1,5 +1,13 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">ブックマークの編集</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">ブックマークURL</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">ブックマークURLがここに表示されます</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">ブックマーク名</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">ブックマークされたURLの名前がここに表示されます</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">ブックマーク名を入力…</string>
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 86bf3a67..681453f1 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,5 +1,14 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">북마크 수정</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">북마크 URL</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">북마크 URL이 여기에 표시됩니다.</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">북마크 이름</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">북마크 된 URL의 이름이 여기에 표시됩니다.</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">북마크 이름 입력…</string>
+
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index d4779e06..87639b97 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,35 +1,45 @@
 <resources>
 
+    /* Static Colors */
+
+    /* Generic Colors */
+
+    <color name="c_navigation_tint">#ffffff</color>
+    <color name="c_background">#1c1b21</color>
+    <color name="c_header_icon_tint">#a6a6a6</color>
+    <color name="c_divider_line_light">#666666</color>
+    <color name="c_topbar_divider">#0f0f0f</color>
+    <color name="c_edittext_border">#2c2b31</color>
+    <color name="c_edittext_error_border">#790606</color>
+    <color name="c_edittext_error_background">#300303</color>
+    <color name="c_text_short_header">#33cccc</color>
+
+    <color name="c_text_v1">#ffffff</color>
+    <color name="c_text_v2">#b3b3b3</color>
+
+
     /* Customs Colors */
 
-    <color name="c_background">#1c1b21</color>
     <color name="c_background_alpha">#60ffffff</color>
     <color name="c_background_keyboard">#091a2a</color>
     <color name="c_background_inverted">#ffffff</color>
-    <color name="c_view_divier_background_inner">#0f0f0f</color>
-    <color name="c_view_divier_background_inner_v1">#666666</color>
     <color name="c_view_divier_background">#141414</color>
-    <color name="c_text_v1">#ffffff</color>
-    <color name="c_text_v2">#b3b3b3</color>
     <color name="c_text_v3">#666666</color>
     <color name="c_text_v4">#a6a6a6</color>
     <color name="c_text_v5">#ffffff</color>
     <color name="c_text_v7">#248f8f</color>
     <color name="c_text_v8">#a6a6a6</color>
     <color name="c_text_v9">#e6e6e6</color>
-    <color name="c_icon_tint">#ffffff</color>
     <color name="c_security_popup_background">#121216</color>
     <color name="c_security_popup_divider">#121216</color>
-    <color name="c_icon_tint_light">#a6a6a6</color>
     <color name="c_lang_row">#293a56</color>
     <color name="c_lang_row_border">#3a5278</color>
-    <color name="c_text_setting_heading">#33cccc</color>
     <color name="c_button_text_v1">#ffffff</color>
     <color name="c_button_text_v1_inverted">#3385ff</color>
     <color name="c_button_text_v2">#ffffff</color>
     <color name="c_button_text_v3">#ffffff</color>
     <color name="c_text_setting_heading_v2">#33cccc</color>
-    <color name="c_navigation_tint">#ffffff</color>
+    <color name="c_edittext_background_form_inactive">#4d4d4d</color>
     <color name="c_navigation_medium">#bfbfbf</color>
     <color name="c_navigation_light">#999999</color>
     <color name="c_switch_theme">#33cccc</color>
@@ -57,8 +67,7 @@
     <color name="c_profile_radial_inner">#2c2b31</color>
     <color name="c_profile_radial_outer">#2c2b31</color>
     <color name="c_edittext_background">#3c3946</color>
-    <color name="c_border_background_dark">#2c2b31</color>
-    <color name="c_edittext_background_error">#660b0b</color>
+    <color name="c_edittext_background_blue">#3c3946</color>
     <color name="c_edittext_background_dark">#24222a</color>
     <color name="c_menu_drop_shadow_05">#00000000</color>
     <color name="c_menu_drop_shadow_10">#00000000</color>
diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
index 49183232..1a38d917 100644
--- a/app/src/main/res/values-night/strings.xml
+++ b/app/src/main/res/values-night/strings.xml
@@ -1,6 +1,6 @@
 <resources>
 
     <!-- Application Strings -->
-    <string name="mode">Night</string>
+    <string name="mode" translatable="false">Night</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d26ef2b4..efb02c25 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,5 +1,17 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Bladwijzer Bewerken</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">Bladwijzer-URL</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">De bladwijzer-URL wordt hier weergegeven</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Naam Bladwijzer</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">De naam van de url met bladwijzer wordt hier weergegeven</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Voer de naam van de bladwijzer in...</string>
+
+
+
+
+
 	<!-- Application Strings -->
 	<string name="GENERAL_SEARCH_HINT" translatable="true">Zoek of typ een webadres</string>
 	<string name="GENERAL_FIND_HINT" translatable="true">Zoek op pagina</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a67ebc74..ac686f93 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,5 +1,15 @@
 <resources>
 
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Editar Favorito</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">URL Do Favorito</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">O URL do favorito será mostrado aqui</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Nome Do Marcador</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">O nome do url marcado será mostrado aqui</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Insira o nome do favorito ...</string>
+
+
+
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f11daab3..f2f1f407 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,5 +1,15 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Editați Marcajul</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">Adresa URL A Marcajului</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">Adresa URL a marcajului va fi afișată aici</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Nume Marcaj</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Numele adresei URL marcate va apărea aici</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Introduceți numele marcajului …</string>
+
+
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 588cc880..0edf17b4 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,5 +1,16 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Редактировать закладку</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">URL-адрес закладки</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">URL закладки будет отображаться здесь</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Имя закладки</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Здесь будет отображаться имя URL-адреса, добавленного в закладки</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Введите название закладки…</string>
+
+
+
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 74eb6300..db75744d 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,5 +1,16 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">แก้ไขบุ๊คมาร์ค</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">บุ๊คมาร์ค URL</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">บุ๊กมาร์ก URL จะแสดงที่นี่</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">ชื่อบุ๊คมาร์ค</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">ชื่อของ URL ที่คั่นไว้จะแสดงที่นี่</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">ใส่ชื่อบุ๊คมาร์ค...</string>
+
+
+
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3750df7f..a034b3ec 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,5 +1,18 @@
 <resources>
 
+    <!-- Bookmark Setting -->
+    <string name="BOOKMARK_SETTING_HEADER" translatable="true">Yer İşaretini Düzenle</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">Yer İşareti URL\'si</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">Yer imi URL\'si burada gösterilecek</string>
+    <string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Yer İşareti Adı</string>
+    <string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">İşaretli URL\'nin adı burada gösterilecek</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Yer imi adını girin…</string>
+
+
+
+
+
+
 
     <!-- Generated by Automatic String Resource Translation -->
     <!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f9952d45..55832d31 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,5 +1,19 @@
 <resources>
 
+	<!-- Bookmark Setting -->
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">Редагувати закладку</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">URL-адреса закладки</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">URL-адреса закладки відображатиметься тут</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Назва закладки</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Назва URL-адреси із закладками буде показано тут</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Введіть назву закладки ...</string>
+
+
+
+
+
+
+
 	<!-- Application Strings -->
 	<string name="GENERAL_SEARCH_HINT" translatable="true">щось шукати або ввести веб-посилання</string>
 	<string name="GENERAL_FIND_HINT" translatable="true">знайти на сторінці</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index a3d82770..6410f423 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -1,5 +1,15 @@
 <resources>
 
+	<string name="BOOKMARK_SETTING_HEADER" translatable="true">بُک مارک میں ترمیم کریں</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">بک مارک یو آر ایل</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">بک مارک یو آر ایل یہاں دکھائے</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">گا بُک مارک کا نام</string>
+	<string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">یہاں بک مارک یو آر ایل کا نام دکھائے گا</string>
+	<string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">بک مارک کا نام درج کریں…</string>
+
+
+
+
 
 	<!-- Generated by Automatic String Resource Translation -->
 	<!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 061e4ab0..95b0adcf 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,5 +1,17 @@
 <resources>
 
+    <!-- Bookmark Setting -->
+    <string name="BOOKMARK_SETTING_HEADER" translatable="true">Chỉnh Sửa Dấu Trang</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">URL đánh Dấu</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">URL đánh dấu sẽ hiển thị ở đây</string>
+    <string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Tên Dấu Trang</string>
+    <string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Tên của url được đánh dấu sẽ hiển thị ở đây</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Nhập tên dấu trang…</string>
+
+
+
+
+
 
     <!-- Generated by Automatic String Resource Translation -->
     <!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 5227c2ed..933fd691 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,5 +1,18 @@
 <resources>
 
+    <!-- Bookmark Setting -->
+    <string name="BOOKMARK_SETTING_HEADER" translatable="true">编辑书签</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">书签网址</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">书签 URL 将显示在此处</string>
+    <string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">书签名称</string>
+    <string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">书签网址的名称将显示在此处</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">输入书签名称...</string>
+
+
+
+
+
+
 
     <!-- Generated by Automatic String Resource Translation -->
     <!--          https://asrt.gluege.boerde.de             -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dfe699e6..16b27acf 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,17 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    /* Static Colors */
+
+    <color name="c_text_color_highlight_v1">#b3d1ff</color>
+    <color name="c_text_color_highlight_v2">#99bbff</color>
+    <color name="c_error_text_color">#f32323</color>
+    <color name="c_gray_light">#d9d9d9</color>
+
+    /* Generic Colors */
+
+    <color name="c_navigation_tint">#000000</color>
+    <color name="c_background">#ffffff</color>
+    <color name="c_header_icon_tint">#7591bd</color>
+    <color name="c_divider_line_light">#e6e6e6</color>
+    <color name="c_topbar_divider">#ebebeb</color>
+    <color name="c_edittext_border">#e2e7e9</color>
+    <color name="c_edittext_error_border">#f32323</color>
+    <color name="c_edittext_error_background">#f9e2eb</color>
+    <color name="c_text_short_header">#3385ff</color>
+
+    <color name="c_text_v1">#111722</color>
+    <color name="c_text_v2">#999999</color>
+
     /* Customs Colors */
 
-    <color name="c_background">#ffffff</color>
     <color name="c_background_alpha">#601c1b21</color>
     <color name="c_background_keyboard">#999999</color>
     <color name="c_background_inverted">#302e38</color>
-    <color name="c_view_divier_background_inner">#ebebeb</color>
-    <color name="c_view_divier_background_inner_v1">#e6e6e6</color>
     <color name="c_view_divier_background">#e6e6e6</color>
-    <color name="c_text_v1">#111722</color>
-    <color name="c_text_v2">#999999</color>
     <color name="c_text_v3">#bfbfbf</color>
     <color name="c_text_v4">#425e8a</color>
     <color name="c_text_v5">#000000</color>
@@ -20,16 +37,13 @@
     <color name="c_text_v8">#666666</color>
     <color name="c_text_v9">#7591bd</color>
     <color name="c_icon_tint">#425e8a</color>
-    <color name="c_icon_tint_light">#7591bd</color>
     <color name="c_lang_row">#7591bd</color>
     <color name="c_lang_row_border">#3a5278</color>
-    <color name="c_text_setting_heading">#3385ff</color>
     <color name="c_button_text_v1">#3385ff</color>
     <color name="c_button_text_v1_inverted">#ffffff</color>
     <color name="c_button_text_v2">#b3b3b3</color>
     <color name="c_button_text_v3">#3385ff</color>
     <color name="c_text_setting_heading_v2">#00b3b3</color>
-    <color name="c_navigation_tint">#000000</color>
     <color name="c_navigation_medium">#999999</color>
     <color name="c_navigation_light">#bfbfbf</color>
     <color name="c_switch_theme">#3385ff</color>
@@ -39,8 +53,8 @@
     <color name="c_button">#0066FF</color>
     <color name="c_checkbox_tint">#3385ff</color>
     <color name="c_checkbox_tint_default">#3385ff</color>
+    <color name="c_edittext_background_blue">#f5f9ff</color>
     <color name="c_border_background">#f9f9f9</color>
-    <color name="c_border_background_dark">#e2e7e9</color>
     <color name="c_border_background_divider">#f7f7f7</color>
     <color name="c_security_popup_background">#f5fff5</color>
     <color name="c_security_popup_divider">#e0ffe0</color>
@@ -60,7 +74,7 @@
     <color name="c_profile_radial_inner">#000000</color>
     <color name="c_profile_radial_outer">#ffffff</color>
     <color name="c_edittext_background">#f1f3f4</color>
-    <color name="c_edittext_background_error">#f9e2eb</color>
+    <color name="c_edittext_background_form_inactive">#f6f7f8</color>
     <color name="c_edittext_background_dark">#f5f5f5</color>
     <color name="c_button_warning">#f65555</color>
     <color name="c_rateus_warning">#b3b3b3</color>
@@ -98,8 +112,6 @@
     <color name="landing_ease_blue_light_1">#eef1f7</color>
     <color name="landing_ease_blue_light_2">#eef1f7</color>
     <color name="cursor_blue">#3385ff</color>
-    <color name="text_color_highlight_v1">#b3d1ff</color>
-    <color name="text_color_highlight_v3">#99bbff</color>
     <color name="blue_dark">#ffffff</color>
     <color name="blue_dark_v1">#ffffff</color>
     <color name="blue_dark_v2">#ffffff</color>
@@ -117,7 +129,6 @@
     <color name="holo_dark_gray">#999999</color>
     <color name="holo_gray">#b3b3b3</color>
     <color name="float_white">#bfbfbf</color>
-    <color name="button_gray">#d9d9d9</color>
     <color name="button_gray_alpha">#AAffffff</color>
     <color name="button_light">#e3e3e3</color>
     <color name="holo_gray_light">#f2f2f2</color>
@@ -128,18 +139,21 @@
     <color name="white">#ffffff</color>
     <color name="clear_tint">#00000000 </color>
     <color name="dark_red">#910808</color>
-    <color name="dark_red_soft">#f32323</color>
     <color name="green">#33cc33</color>
     <color name="green_button">#00b33c</color>
     <color name="green_dark">#212d45</color>
+    <color name="green_alert">#006666</color>
+    <color name="green_alert_dark">#004d4d</color>
     <color name="green_dark_v1">#0A1727</color>
     <color name="green_dark_v2">#fafcff</color>
     <color name="dark_purple">#ffffff</color>
     <color name="warning">#ffc107</color>
+    <color name="warning_dark">#997300</color>
     <color name="connectors">#ffffff</color>
     <color name="colorProgressGradientStart">#00d9ff</color>
     <color name="colorProgressGradientEnd">#00a4fd</color>
     <color name="slate">#5A7585</color>
     <color name="secondary">#00b3b3</color>
 
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7c2bea87..3c08e2ad 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,9 @@
 <resources>
 
     <!-- Application Strings -->
-    <string name="mode">Day</string>
+    <string name="mode" translatable="false">Day</string>
     <string name="app_name" translatable="false">Genesis</string>
-    <string name="GENERAL_DEFAULT_TEXT" translatable="true">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum</string>
+    <string name="GENERAL_DEFAULT_TEXT" translatable="false">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum</string>
     <string name="GENERAL_SEARCH_HINT" translatable="true">Search or type a web address</string>
     <string name="GENERAL_FIND_HINT" translatable="true">Find in page</string>
     <string name="GENERAL_SEARCH_ENGINE" translatable="true">Search Engine</string>
@@ -19,18 +19,12 @@
     <string name="GENERAL_HIDDEN_WEB" translatable="false">Search the web ...</string>
 
     <!-- Shortcuts -->
-    <string name="shortcut_erase_short_label">Erase data</string>
-    <string name="shortcut_erase_long_label">Erase browsing history</string>
-    <string name="shortcut_erase_and_open_short_label">Erase &amp; open</string>
-    <string name="shortcut_erase_and_open_long_label">Erase and open</string>
-    <string name="shortcut_open">Restart or Open</string>
-    <string name="shortcut_open_long">Restart Application</string>
-
-    <!-- Temp -->
-    <string name="downloading">Downloading...</string>
-    <string name="title_file_download">APK is downloading</string>
-    <string name="storage_access_required">Storage access is required to downloading the file.</string>
-    <string name="storage_permission_denied">Storage permission request was denied.</string>
+    <string name="shortcut_erase_short_label" translatable="false">Erase data</string>
+    <string name="shortcut_erase_long_label" translatable="false">Erase browsing history</string>
+    <string name="shortcut_erase_and_open_short_label" translatable="false">Erase &amp; open</string>
+    <string name="shortcut_erase_and_open_long_label" translatable="false">Erase and open</string>
+    <string name="shortcut_open" translatable="false">Restart or Open</string>
+    <string name="shortcut_open_long" translatable="false">Restart Application</string>
 
     <!-- Settings -->
     <string name="SETTING_DEFAULT_LANGUAGE" translatable="false">ru</string>
@@ -124,14 +118,12 @@
     <string name="SETTING_PRIVACY_COOKIES_OPTION2" translatable="true">Enabled, excluding tracking cookies</string>
     <string name="SETTING_PRIVACY_COOKIES_OPTION3" translatable="true">Enabled, excluding 3rd party</string>
     <string name="SETTING_PRIVACY_COOKIES_OPTION4" translatable="true">Disabled</string>
-
     <string name="SETTING_PRIVACY_TRACKING_OPTION1" translatable="true">Disable Protection</string>
     <string name="SETTING_PRIVACY_TRACKING_OPTION1_INFO" translatable="true">Allow identity tracking. This might cause your online identity to be stolen</string>
     <string name="SETTING_PRIVACY_TRACKING_OPTION2" translatable="true">Default (Recommended)</string>
     <string name="SETTING_PRIVACY_TRACKING_OPTION2_INFO" translatable="true">Block advertisement and social tracking. Pages will load normally</string>
     <string name="SETTING_PRIVACY_TRACKING_OPTION3" translatable="true">Strict Policy</string>
     <string name="SETTING_PRIVACY_TRACKING_OPTION3_INFO" translatable="true">Stop all known trackers, Pages will load faster but some functionality might not work</string>
-
     <string name="SETTING_PRIVACY_JAVASCRIPT" translatable="true">Allow Javascript | Toggle to Enable Javascript</string>
     <string name="SETTING_PRIVACY_JAVASCRIPT_INFO" translatable="true">Disable java scripting for various script attacks</string>
     <string name="SETTING_PRIVACY_POPUP" translatable="true">Block Popup | Toggle to Disable Popup Advert</string>
@@ -209,27 +201,27 @@
 
     <!-- Alerts -->
     <string name="ALERT_UPDATE_BRIDGES" translatable="true">Provide a Bridge I know</string>
-    <string name="ALERT_UPDATE_BRIDGES_INFO" translatable="true">Enter bridge information from a trusted source</string>
+    <string name="ALERT_UPDATE_BRIDGES_INFO" translatable="true"><b><font color='#00b3b3'>PROVIDE A BRIDGE &#160;</font></b>&#160;Enter bridge information from a trusted source</string>
     <string name="ALERT_ADD_BRIDGES_HINT_V1" translatable="true">bridge string (obfs4 212.21.66.66:20621 ...)</string>
     <string name="ALERT_ADD_BRIDGES_TYPE_HINT_V1" translatable="true">bridge type (obfs4, meek, ...)</string>
     <string name="ALERT_REQUEST_BRIDGE" translatable="true">Request</string>
     <string name="ALERT_SAVE_BRIDGE" translatable="true">Done</string>
-
     <string name="ALERT_CREATE_BOOKMARK" translatable="true">Bookmark Website</string>
-    <string name="ALERT_CREATE_BOOKMARK_INFO" translatable="true">Add this page to your bookmarks</string>
-    <string name="ALERT_CLEAR_HISTORY" translatable="true">Clear History and Data</string>
+    <string name="ALERT_CREATE_BOOKMARK_INFO" translatable="true"><b><font color='#00b3b3'>BOOKMARK WEBSITE &#160;</font></b>&#160;Add this page to your bookmarks</string>
+    <string name="ALERT_CLEAR_HISTORY" translatable="true">Remove browser history ?</string>
     <string name="ALERT_CLEAR_BOOKMARK" translatable="true">Clear Bookmark and Data</string>
     <string name="ALERT_CLEAR_HISTORY_INFO" translatable="true">Clearing data will remove history, cookies, and other browsing data</string>
-    <string name="ALERT_CLEAR_BOOKMARK_INFO" translatable="true">Clearing data will remove bookmarked websites</string>
+    <string name="ALERT_CLEAR_BOOKMARK_INFO" translatable="true">Remove all bookmarks ?</string>
     <string name="ALERT_DISMISS" translatable="true">Dismiss</string>
     <string name="ALERT_CLEAR" translatable="true">Clear</string>
+    <string name="ALERT_CONFIRM" translatable="true">Confirm</string>
     <string name="ALERT_ADD" translatable="true">Done</string>
-    <string name="ALERT_TITLE_ADD" translatable="true">New Bookmark</string>
+    <string name="ALERT_TITLE_ADD" translatable="true">bookmark name...</string>
     <string name="ALERT_SECURE" translatable="false">https://</string>
     <string name="ALERT_SECURE_INFO" translatable="true">Connection is secure</string>
     <string name="ALERT_SECURE_INFO_DETAIL" translatable="true">Your information(for example, password or credit card numbers) is private when it is sent to this site</string>
     <string name="ALERT_SECURE_INFO_SETTINGS" translatable="true">Privacy Settings</string>
-    <string name="ALERT_DOWNLOAD_SINGLE" translatable="true">Download</string>
+    <string name="ALERT_DOWNLOAD_SINGLE" translatable="true">Waiting to download ...</string>
     <string name="ALERT_DOWNLOAD_SINGLE_BUTTON" translatable="true">Download</string>
     <string name="ALERT_REPORT" translatable="true">Report</string>
     <string name="ALERT_REPORT_URL" translatable="true">Report Website</string>
@@ -239,22 +231,18 @@
     <string name="ALERT_RATEUS" translatable="true">Rate US</string>
     <string name="ALERT_RATEUS_INFO" translatable="true">Tell others what you think about this app</string>
     <string name="ALERT_RATE" translatable="true">Rate</string>
-    <string name="ALERT_RATEUS_FAILURE" translatable="true">Sorry To Hear That!</string>
-    <string name="ALERT_RATEUS_FAILURE_INFO" translatable="true">If you are having difficulty while using this application please reach out to us via email. We will try to solve your problem as soon as possible</string>
+    <string name="ALERT_RATEUS_FAILURE_INFO" translatable="true"><b><font color='#00b3b3'>SORRY TO HEAR THAT ! &#160;</font></b>&#160;If you are having difficulty while using this application please reach out to us via email. We will try to solve your problem as soon as possible</string>
     <string name="ALERT_MAIL" translatable="true">Mail</string>
     <string name="ALERT_BRIDGE_MAIL" translatable="true">Request New Bridge</string>
-    <string name="ALERT_BRIDGE_MAIL_INFO" translatable="true">Select E-mail below to request a bridge address.\n\nOnce you have an address, copy &amp; paste it into the above box and start the application.</string>
+    <string name="ALERT_BRIDGE_MAIL_INFO" translatable="true"><b><font color='#00b3b3'>REQUEST BRIDGE &#160;</font></b>&#160;Select E-mail below to request a bridge address.\n\nOnce you have an address, copy &amp; paste it into the above box and start the application.</string>
     <string name="ALERT_LANGUAGE_SUPPORT_FAILURE" translatable="true">Language not supported</string>
     <string name="ALERT_LANGUAGE_SUPPORT_FAILURE_INFO" translatable="true">System language is not supported by this application. We are working to include it soon</string>
     <string name="ALERT_ORBOT_INIT" translatable="true">Initializing Genesis</string>
     <string name="ALERT_NOT_SUPPORTED" translatable="true">Action not supported</string>
     <string name="ALERT_NOT_SUPPORTED_INFO" translatable="true">No application found to handle the following command</string>
-
-    <string name="ALERT_PANIC" translatable="true">Troubleshoot | Genesis</string>
-    <string name="ALERT_PANIC_INFO" translatable="true">Reset application in case if its not working. We will try to reconfigure it so it might work again. \n\n⚠️ Warning! it will clear Genesis app data</string>
+    <string name="ALERT_PANIC_INFO" translatable="true"><b><font color='#f32323'>TROUBLESHOOT &#160;</font></b>&#160; Reset application in case if its not working. We will try to reconfigure it so it might work again. <b><font color='#000000'>Warning!</font></b> it will clear Genesis app data</string>
     <string name="ALERT_PANIC_BT_1" translatable="true">Reset</string>
     <string name="ALERT_PANIC_BT_2" translatable="true">Dismiss</string>
-
     <string name="ALERT_WELCOME_MESSAGE" translatable="true">Welcome | Hidden  Web Gateway</string>
     <string name="ALERT_WELCOME_MESSAGE_INFO" translatable="true">This application provide you a platform to search and open hidden web urls. Here are few suggestions\n</string>
     <string name="ALERT_WELCOME_MESSAGE_BT_1" translatable="true">Deep Web Online Market</string>
@@ -286,7 +274,7 @@
     <string name="ALERT_NOT_SUPPORTED_MESSAGE" translatable="true">No application found to handle email</string>
     <string name="ALERT_DOWNLOAD_MESSAGE" translatable="true">Download File | </string>
     <string name="ALERT_DATA_CLEARED" translatable="true">Data Cleared | Restart Required</string>
-    <string name="ALERT_DATA_CLEARED_INFO" translatable="true">Private data cleared successfully. Some default settings will require application to restart. Now you can safely continue browsing</string>
+    <string name="ALERT_DATA_CLEARED_INFO" translatable="true">Data cleared successfully</string>
     <string name="ALERT_UNDO_TAB_REMOVE_INFO" translatable="true">Tab Closed</string>
     <string name="ALERT_UNDO_TAB_REMOVE_BUTTON" translatable="true">Undo</string>
     <string name="ALERT_OPEN_NEW_TAB" translatable="true">New tab opened</string>
@@ -296,44 +284,17 @@
     <string name="ALERT_DATA_CLEARED_BUTTON" translatable="true">Closing Genesis Please Wait ...</string>
     <string name="ALERT_ORBOT_LOADING" translatable="true">Genesis Connecting ...</string>
     <string name="ALERT_ORBOT_LOADING_INFO" translatable="true">Genesis proxy connecting ...</string>
-
-    <string name="ALERT_CRASH" translatable="true">Unexpected Error</string>
-    <string name="ALERT_CRASH_INFO" translatable="true">Application crashed due to unexpected error. We are looking into the issue mean while you can continue with this application</string>
-
-    <!-- Privacy Policy -->
-    <string name="PRIVACY_HEADER" translatable="true">Privacy Policy</string>
-    <string name="PRIVACY_DESCRIPTION" translatable="true">We don\'t collect information and thats our privacy in a nutshell</string>
-    <string name="HEADER_1" translatable="true">Search Leakages</string>
-    <string name="HEADER_1_DESC" translatable="true">At other search engines, when you do a search and then click on a link, your search terms are sent to that site you clicked on (in the HTTP referrer header). We call this sharing of personal information "search leakage”, For example, when you search for something private, you are sharing that private search not only with your search engine, but also with all the sites that you clicked on (for that search). In addition, when you visit any site, your computer automatically sends information about it to that site (including your User agent and IP address). This information can often be used to identify you directly. So when you do that private search, not only can those other sites know your search terms, but they can also know that you searched it. It is this combination of available information about you that raises privacy concerns. Genesis prevents search leakage by default. Instead, when you click on a link on our site, we route (redirect) that request in such a way so that it does not send your search terms to other sites. The other sites will still know that you visited them, but they will not know what search you entered beforehand.\n\nAt some other search engines (including us), you can also use an encrypted version (HTTPS), which as a byproduct doesn't usually send your search terms to sites. However, it is slower to connect to these versions and if you click on a site that also uses HTTPS then your search is sent. Nevertheless, the encrypted version does protect your search from being leaked onto the computers it travels on between you and us.\n\nAt Genesis, our encrypted version goes even further and automatically changes links from a number of major Web sites to point to the encrypted versions of those sites. It is modeled after (and uses code from) the HTTPS Everywhere. These sites include Wikipedia, Facebook, Twitter, and Amazon to name a few. Another way to prevent search leakage is by using something called a POST request, which has the effect of not showing your search in your browser, and, as a consequence, does not send it to other sites. You can turn on POST requests on our settings page, but it has its own issues. POST requests usually break browser back buttons, and they make it impossible for you to easily share your search by copying and pasting it out of your Web browser's address bar.\n\nFinally, if you want to prevent sites from knowing you visited them at all, you can use a proxy like Tor. Genesis actually operates a Tor exit enclave, which means you can get end to end anonymous and encrypted searching using Tor and DDG together. You can enter !proxy domain into Genesis as well, and we will route you through a proxy, e.g. !proxy breadpig.com. Unfortunately, proxies can also be slow, and free proxies (like the one we use) are funded by arguably excessive advertising. Because of these drawbacks in HTTPS, POST and proxies we decided to take the redirect approach to combat search leakage. However, we leave the choice up to you. You can deviate from the default on our settings page by toggling the redirect or address bar settings. You can also use our encrypted version.</string>
-    <string name="HEADER_2" translatable="true">Search History</string>
-    <string name="HEADER_2_DESC" translatable="true">Other search engines save your search history. Usually your searches are saved along with the date and time of the search, some information about your computer (e.g. your IP address, User agent and often a unique identifier stored in a browser cookie), and if you are logged in, your account information (e.g. name and email address). With only the timestamp and computer information, your searches can often be traced directly to you. With the additional account information, they are associated directly with you. Also, note that with this information your searches can be tied together. This means someone can see everything youve been searching, not just one isolated search. You can usually find out a lot about a person from their search history. Its sort of creepy that people at search engines can see all this info about you, but that is not the main concern. The main concern is when they either a) release it to the public or b) give it to law enforcement. Why would they release it to the public? AOL famously released supposedly anonymous search terms for research purposes, except they didnt do a good job of making them completely anonymous, and they were ultimately.\n\n The other way to release it to the public is by accident. Search engines could lose data, or get hacked, or accidentally expose data due to security holes or incompetence, all of which has happened with personal information on the Internet. Why would search engines give your search history to law enforcement? Simply because law enforcement asked for it, usually as part of a legal investigation. If you read privacy policies and terms of service carefully you will notice that they say they can give your information on court order. This makes sense because they may be legally obligated to do so. However, search engines are not legally obligated to collect personal information in the first place. They do it on their own volition. The bottom line is if search engines have your information, it could get out, even if they have the best intentions. And this information (your search history) can be pretty personal.\n\nFor these reasons, Genesis takes the approach to not collect any personal information. The decisions of whether and how to comply with law enforcement requests, whether and how to anonymize data, and how to best protect your information from hackers are out of our hands. Your search history is safe with us because it cannot be tied to you in any way.</string>
-    <string name="HEADER_3" translatable="true">Information Not Collected</string>
-    <string name="HEADER_3_DESC" translatable="true">When you search at Genesis, we dont know who you are and there is no way to tie your searches together. When you access Genesis (or any Web site), your Web browser automatically sends information about your computer, e.g. your User agent and IP address because this information could be used to link you to your searches, we do not log (store) it at all. This is a very unusual practice, but we feel it is an important step to protect your privacy. It is unusual for a few reasons. First, most server software auto-stores this information, so you have to go out of your way not to store it. Second, most businesses want to keep as much information as possible because they dont know when it will be useful. Third, many search engines actively use this information, for example to show you more targeted advertising.\n\nAnother way that your searches are often tied together at other search engines are through browser cookies, which are pieces of information that sit on your computer and get sent to the search engine on each request. What search engines often do is store a unique identifier in your browser and then associate that identifier with your searches.\n\nAt Genesis, no cookies are used by default. In response to efforts by the EFF and others, the major search engines have begun "anonymizing" their search log data after periods of time. Sure, this is better than not doing so, but you should note that this does not make your search history anonymous in the same way that it is at Genesis. What search engines generally do when they anonymize data is get rid of part of your IP address or turn it into something that doesnt look exactly like an IP address. And they do the same thing for uniquely identifying cookies. However, in many cases, this so-called anonymous data can still tie your searches together, which can be used to reconstruct who you are and what you searched for. Additionally, search engines usually are silent on what they do with the User agent, which has been shown to also have enough information to often be personally identifiable, especially if isolated to a particular search session (day).</string>
-    <string name="HEADER_4" translatable="true">Information Collected</string>
-    <string name="HEADER_4_DESC" translatable="true">At Genesis, no cookies are used by default. If you have changed any settings, then cookies are used to store those changes. However, in that case, they are not stored in a personally identifiable way. For example, the large size setting is stored as s=l; no unique identifier is in there. Furthermore, if you prefer not to use cookies to store settings, you can use URL parameters instead.\n\nWe do not use any third parties to do the code insertion, and we do not work with any sites that share personally identifiable information (e.g. name, address, etc.) via their affiliate programs. This means that no information is shared from Genesis to the sites, and the only information that is collected from this process is product information, which is not tied to any particular user and which we do not save or store on our end. It is completely analogous to the search result case from the previous paragraph--we can see anonymous product info such that we cannot tie them to any particular person (or even tie multiple purchases together).\n\nThis whole affiliate process is an attempt to keep advertising to a minimal level on Genesis. Finally, if you give us feedback, it may be stored in our email. However, you can give anonymous feedback (by not entering your email or other personal info on the feedback form).</string>
-    <string name="HEADER_5" translatable="true">Information Shared</string>
-    <string name="HEADER_5_DESC" translatable="true">If you turn redirects off in the settings and you dont either turn POST on or use our encrypted site, then your search could leak to sites you click on. Yet as explained above, this does not happen by default. Also, like anyone else, we will comply with court ordered legal requests. However, in our case, we dont expect any because there is nothing useful to give them since we dont collect any personal information</string>
-    <string name="HEADER_6" translatable="true">Website Content Policy</string>
-    <string name="HEADER_6_DESC" translatable="true">This SERVICE is provided by at no cost and is intended for use as is. This page is used to inform visitors regarding my policies with the collection, use, and disclosure of Personal Information if anyone decided to use my Service. If you choose to use my Service, then you agree to the collection and use of information in relation to this policy. The Personal Information that we collect is used for providing and improving the Service. We will not use or share your information with anyone except as described in this Privacy Policy.\n\nThe terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, which is accessible at https://genesishiddentechnologies.com/privacy unless otherwise defined in this Privacy Policy.
-                                                        For a better experience, while using our Service, we may collect a certain personally identifiable information that is Advertisement Identifier. The information that we collect is retained on your device and is not collected by me in any way. The app does use third party services that may collect information used to identify you. Link to privacy policy of third party service providers used by the app are\n
-                                                        Google Play Services: https://policies.google.com/privacy
-                                                        https://support.google.com/admob/answer/6128543?hl=en
-                                                        This application collects user android advertisement identifier and sends it to third party that is google admob for displaying best advertisement suited for that individual but We don’t personally maintain or use this advertisement identifier in any way. We may employ third-party companies and individuals due to the following reasons:\n
-                                                        To facilitate our Service
-                                                        To provide the Service on our behalf
-                                                        To perform Service-related services or
-                                                        To analyzing service usage
-                                                        We want to inform users of this Service that these third parties have access to your Personal Information. The reason is to perform the tasks assigned to them on our behalf. However, they are obligated not to disclose or use the information for any other purpose. We value your trust in providing us your Personal Information, thus we are striving to use commercially acceptable means of protecting it. But remember that no method of transmission over the internet, or method of electronic storage is 100% secure and reliable, and we cannot guarantee its absolute security\n\n
-                                                        This Service only contain links to other sites. If you click on a third-party link, you will be directed to that site. Note that these external sites are not operated by us. Therefore, we strongly advise you to review the Privacy Policy of these websites. We have no control over and assume no responsibility for the content, privacy policies, or practices of any third-party sites or services. We may update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page. These changes are effective immediately after they are posted on this page.</string>
+    <string name="ALERT_ORBOT_LOADING_BUTTON" translatable="true">Open Logs</string>
+    <string name="ALERT_CRASH" translatable="true">Application closed unexpectedly</string>
+    <string name="ALERT_CRASH_INFO" translatable="true"><b><font color='#f32323'>Request New Bridge &#160;</font></b>&#160;Application crashed due to unexpected error. We are looking into the issue mean while you can continue with this application</string>
 
     <!-- Bookmark Setting -->
     <string name="BOOKMARK_SETTING_HEADER" translatable="true">Edit Bookmark</string>
     <string name="BOOKMARK_SETTING_HEADER_NAME" translatable="true">Bookmark URL</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME_INFO" translatable="true">Bookmark URL will show here</string>
     <string name="BOOKMARK_SETTING_HEADER_URL" translatable="true">Bookmark Name</string>
-    <string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">enter bookmark name</string>
-    <string name="BOOKMARK_SETTING_HEADER_URL_HINT" translatable="true">enter bookmark url</string>
-    <string name="BOOKMARK_SETTING_HEADER_NAME_ERROR" translatable="true"> ➔ invalid bookmark name</string>
-    <string name="BOOKMARK_SETTING_HEADER_URL_ERROR" translatable="true"> ➔ invalid bookmark url</string>
+    <string name="BOOKMARK_SETTING_HEADER_URL_INFO" translatable="true">Name of bookmarked url will show here</string>
+    <string name="BOOKMARK_SETTING_HEADER_NAME_HINT" translatable="true">Enter bookmark name…</string>
 
     <!-- Bridge Settings -->
     <string name="BRIDGE_BASIC_SETTING" translatable="true">Security Settings</string>
@@ -357,6 +318,8 @@
     <!-- Popup Menu -->
     <string name="HOME_MENU__NEW_CIRCUIT" translatable="true">New identity</string>
     <string name="HOME_MENU__NEW_CIRCUIT_CREATED" translatable="true">New identity created</string>
+    <string name="HOME_MENU__BOOKMARK_REMOVED" translatable="true">Bookmark removed</string>
+    <string name="HOME_MENU__BOOKMARK_UPDATE" translatable="true">Bookmark updated</string>
     <string name="HOME_MENU__ORBOT_LOGS" translatable="true">Genesis Logs</string>
     <string name="HOME_MENU__NEW_TABS" translatable="true">New tabs</string>
     <string name="HOME_MENU_CLOSE_TABS" translatable="true">Close Tab</string>
@@ -393,12 +356,14 @@
     <!-- History Popup Menu -->
     <string name="HISTORY_TITLE" translatable="true">History</string>
     <string name="HISTORY_CLEAR" translatable="true">Clear</string>
+    <string name="HISTORY_EMPTY" translatable="true">Pages that you visit appear here</string>
     <string name="HISTORY_SEARCH_HINT" translatable="true">Search ...</string>
 
     <!-- BOOKMARK Popup Menu -->
     <string name="BOOKMARK_TITLE" translatable="true">Bookmark</string>
     <string name="BOOKMARK_CLEAR" translatable="true">Clear</string>
     <string name="BOOKMARK_SEARCH_HINT" translatable="true">Search ...</string>
+    <string name="BOOKMARK_EMPTY" translatable="true">Pages that you bookmark appear here</string>
 
     <!-- Help -->
     <string name="HELP_RETRY" translatable="true">Retry</string>
diff --git a/build.gradle b/build.gradle
index 6f7a38d7..7442499d 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.5.10'
+        kotlin_version = '1.5.20'
     }
     ext.kotlinVersion = '1.1.51'
     repositories {
@@ -10,9 +10,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
-        classpath 'com.google.gms:google-services:4.3.5'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
+        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.google.gms:google-services:4.3.8'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20"
     }
 }
 
diff --git a/orbotmanager/build.gradle b/orbotmanager/build.gradle
index 378653ed..8c83a6c0 100644
--- a/orbotmanager/build.gradle
+++ b/orbotmanager/build.gradle
@@ -53,7 +53,7 @@ dependencies {
     implementation 'com.jaredrummler:android-shell:1.0.0'
     //implementation fileTree(dir: 'libs', include: ['.so','.aar'])
 
-    implementation 'androidx.core:core:1.5.0'
+    implementation 'androidx.core:core:1.6.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     testImplementation 'junit:junit:4.13.2'
 
diff --git a/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java b/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java
index 8bf37898..172b6dd7 100644
--- a/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotmanager/src/main/java/org/torproject/android/service/OrbotService.java
@@ -275,9 +275,9 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
             Notification notification = mNotifyBuilder.build();
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                startForeground(NOTIFY_ID, notification);
+                startForeground(11337, notification);
             } else if (Prefs.persistNotifications() && (!mNotificationShowing)) {
-                startForeground(NOTIFY_ID, notification);
+                startForeground(11337, notification);
                 logNotice("Set background service to FOREGROUND");
             } else {
                 mNotificationManager.notify(NOTIFY_ID, notification);
@@ -519,19 +519,19 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
                         notificationIntent, 0);
 
                 Notification notification = new NotificationCompat.Builder(this)
-                        .setSmallIcon(R.mipmap.ic_stat_tor_logo)
+                        .setSmallIcon(R.drawable.ic_stat_starting_tor_logo)
                         .setContentTitle("Starting Genesis")
                         .setContentIntent(pendingIntent).build();
 
                 startForeground(11337, notification);
-            }else if(Build.VERSION.SDK_INT == 26){
+            }else {
                 String id = "_channel_01";
                 int importance = NotificationManager.IMPORTANCE_LOW;
                 NotificationChannel mChannel = new NotificationChannel(id, "notification", importance);
                 mChannel.enableLights(true);
 
                 Notification notification = new Notification.Builder(getApplicationContext(), id)
-                        .setSmallIcon(R.mipmap.ic_stat_tor_logo)
+                        .setSmallIcon(R.drawable.ic_stat_starting_tor_logo)
                         .setContentTitle("Starting Genesis")
                         .build();
 
diff --git a/orbotmanager/src/main/res/raw-fa/bridges.txt b/orbotmanager/src/main/res/raw-fa/bridges.txt
deleted file mode 100644
index 3069edb3..00000000
--- a/orbotmanager/src/main/res/raw-fa/bridges.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-obfs4 78.215.187.186:45675 AE907EE5FAA5D0D27E0C83EFA6ADF8E79FCC0FF1 cert=/TRjMo+RinKaixARMjMtZZBhystaBe+aDaapPrbiITFtWx3M/AJcvpjHjO54tJqLd1+IWQ iat-mode=0
-obfs4 107.160.7.24:443 7A0904F6D182B81BEFE0DEDAFEC974494672627B cert=a5/IlZMnDvb8d92LTHMfsBIgL7QlDLPiXiLwe85uedC80mGD0QerygzmsWnMEdwG9ER9Eg iat-mode=0
-obfs4 79.136.160.201:46501 66AC975BF7CB429D057AE07FC0312C57D61BAEC1 cert=dCtn9Ya8z+R8YQikdWgC3XTAt58z5Apnm95QHrJwnhFSdnphPPEz+NMm6OawWc2srKLjJg iat-mode=0
-obfs4 94.242.249.2:58809 6AF3024788A7EA8F84E3FA3F60018B62291803E4 cert=X0sDCJLKMM/EISdGDEfGrsks41UYmScjIIXQ9AZgWFVKNKS6klcNEpdF4tNXFz6kIyk4Ug iat-mode=0
-obfs4 35.203.134.33:2224 15524C683CC872C8C8FB5B779A8D53F54F7ADCD4 cert=bXLTv0Kwt1zgPBoeVF86vC+0tYAHepR7+QMczhhTQw9hpAIhatt/Bpe6rSGY63Zh8aZ+dQ iat-mode=0
-obfs4 188.166.252.228:9443 595770328CA95E39FF5B81013880B46CA1B29546 cert=3PjhGUq3xWDMrBAzbV1eU4zPSB3GRGBpYdXQEs9hkrwC9RSZdnEe1P+cg7VgLgYTj/2MMg iat-mode=0
-obfs4 89.163.181.169:443 6A17D1E29E2807A1A4314215553079001031A7FF cert=e8JIYivx1zbYNOqq3a3+nDf/NDHoDQ/th/RVAnlVQePUIHxllG7aOku7pSwZisZ7i6ybVw iat-mode=0
-obfs4 94.242.249.2:40190 C7BE8154678E7537CCAC60B097D51A8A7EF8BCDF cert=8jw57wlMlVXCKsCnF7gCdApx7sRZLD5zPl8qdccwp0zltYG6kMYqBNm60dP8IxRH/l8OcQ iat-mode=0
-obfs4 77.81.104.251:443 115C90EBD0EB631C177560A872535772215478D9 cert=UsuF7oN4KNKviZP54JOyTCoCphrdM5gwZK4vT8GnCAcmqLUJEJxyw1dpko9a/ii6He4iZg iat-mode=0
-obfs4 5.249.146.133:80 FAF3A0073330D6AD92F3B4874B0D945562A633EF cert=TRe8bAODtjcGij7EPQaUayWEOqR99wDh2l3B4hFtCsn1JTJCph03pRZ9tx8wynpLYKWMQg iat-mode=0
-meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
diff --git a/orbotmanager/src/main/res/raw/bridges.txt b/orbotmanager/src/main/res/raw/bridges.txt
index c631831b..08bf4f74 100644
--- a/orbotmanager/src/main/res/raw/bridges.txt
+++ b/orbotmanager/src/main/res/raw/bridges.txt
@@ -1,7 +1,5 @@
-obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1
-obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1
-obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1
-obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1
-obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0
-obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0
+obfs4 185.220.101.165:12346 B3E9AA2080C976E18EDD6AD06A317001172BF3C2 cert=p9L6+25s8bnfkye1ZxFeAE4mAGY7DH4Gaj7dxngIIzP9BtqrHHwZXdjMK0RVIQ34C7aqZw iat-mode=2
+obfs4 69.51.20.56:443 7F4EA8DFB5555304763FBF62BDFF29B8F73BF5F7 cert=ppU2EsiAw76IG7MU7h2KtxiqXDuaxglQkfWTC5I3xElskhnlvmW30Gqd3Wi3x2rCCb/TGA iat-mode=0
+obfs4 185.162.248.147:10111 7207F204CC4E242688FFA252599E51DDA776C01D cert=e3LSXtFXpmAP5pcW2UgSMwi4QaOeRiFxzXj6v9FXpD8yjjZhtcO2PDwBx+vdx4Wb5W3yTw iat-mode=0
 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
+snowflake 192.0.2.3:1
\ No newline at end of file
diff --git a/orbotmanager/src/main/res/raw/debiancacerts.bks b/orbotmanager/src/main/res/raw/debiancacerts.bks
new file mode 100644
index 00000000..3c7d9559
Binary files /dev/null and b/orbotmanager/src/main/res/raw/debiancacerts.bks differ
diff --git a/orbotmanager/src/main/res/values-ach/strings.xml b/orbotmanager/src/main/res/values-ach/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-ach/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-ar/strings.xml b/orbotmanager/src/main/res/values-ar/strings.xml
deleted file mode 100644
index a131e2e3..00000000
--- a/orbotmanager/src/main/res/values-ar/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">اوربوت</string>
-  <string name="app_description">اوربوت هو تطبيق الوكيل-البروكسي الحر الذي يمكّن تطبيقات أخرى لاستخدام الإنترنت بأمان أكثر . يُستخدم اوربوت تور لتشفير تحركات مرورك على الإنترنت ، ثم يخفيك ويجعلك وهمي من خلال سلسلة من أجهزة الكمبيوتر في جميع أنحاء العالم . تور هو تطبيق حر وشبكة مفتوحة والتي تساعدك على حماية نفسك من مراقبة الشبكات التي تهدد الحرية الشخصية والخصوصية ، والأنشطة التجارية السرية والعلاقات ، وأمن الدولة والحكومات القمعيّة والتي تستخدم مايعرف باسم تحليل حركة مرور البيانات .</string>
-    <string name="status_starting_up">جاري تشغيل اوربوت...</string>
-  <string name="status_activated">متصل بشبكة تور</string>
-  <string name="status_disabled">تم إيقاف اوربوت</string>
-  <string name="status_shutting_down">جاري ايقاف خدمة تور</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">لقد تعذر بدء تشغيل تور:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">إعدادات العنوان القابل للاتصال لديك تسببت بخطأ!</string>
-  <string name="your_relay_settings_caused_an_exception_">إعدادات المرحلات لديك تسببت بخطأ!</string>
-    <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
-  <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
-    <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
-  <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
-    <string name="newnym">لقد تحولت الى هوية تور جديدة</string>
-    <string name="updating_settings_in_tor_service">تحديث الاعدادات في خدمات تور</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-az/strings.xml b/orbotmanager/src/main/res/values-az/strings.xml
deleted file mode 100644
index a0da0477..00000000
--- a/orbotmanager/src/main/res/values-az/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Pulsuz proksi tətbiqetməsi olan Orbot başqa tətbiqetmələrə internetdən daha təhlükəsiz istifadə etmək imkanı verir. Orbot sizin internet trafikinizi şifrələmək üçün Tordan istifadə edir və dünyanın hər yerində kompüterlərin birindən o birinə sıçramaqla bunu gizlədir. Tor pulsuz proqram təminatıdır, eyni zamanda sizin şəxsi azadlığınız və təhlükəsizliyinizə, gizli biznes fəaliyyəti və əlaqələrə, o cümlədən trafik analiz adlanan dövlət təhlükəsizliyinə xələl gətirə biləcək şəbəkə nəzarəti formalarından müdafiə olunmağa yardım edən açıq şəbəkədir.</string>
-    <string name="status_starting_up">Orbot başlayır...</string>
-  <string name="status_activated">Tor şəbəkəsinə bağlandı</string>
-  <string name="status_disabled">Orbot deaktivasiya edildi</string>
-  <string name="status_shutting_down">Tor xidməti işini başa vurur</string>
-  <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tor prosesi başlana bilmədi:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Sənin ƏlçatanÜnvanlar seçimin istisnaya səbəb oldu!</string>
-  <string name="your_relay_settings_caused_an_exception_">Sənin keçid seçimlərin istisnaya səbəb oldu!</string>
-    <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı...</string>
-  <string name="something_bad_happened">Nə isə pis bir şey oldu. Girişi yoxla</string>
-    <string name="unable_to_read_hidden_service_name">gizli xidmət adını oxumağı deaktivləşdir</string>
-  <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
-  <string name="newnym">Yeni Tor oxşarına qoşuldun!</string>
-  <string name="updating_settings_in_tor_service">Tor xidmətində quraşdırmalar yüklənir</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-bg/strings.xml b/orbotmanager/src/main/res/values-bg/strings.xml
deleted file mode 100644
index 43d541bf..00000000
--- a/orbotmanager/src/main/res/values-bg/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Орбот</string>
-  <string name="app_description">Orbot е безплатна прокси програма, която дава възможноста на други програми да използват интерент по-сигурно. Orbot използва Tor, за да криптира Интернет трафика и след това го скрива като препраща през няколко компютъра по целия свят. Tor е безплатен софтуер и отворена мрежа, която ти помага да се предпазиш от шпиониране по мрежата, което заплашва твоята свобода и лично пространство, конфиденциални бизнес отношение и връзки, и от вид правителствено следене наречено трафик анализ.</string>
-    <string name="status_starting_up">Орбот стартира...</string>
-  <string name="status_activated">Свързан към Тор мрежата</string>
-  <string name="status_disabled">Орбот е деактивиран</string>
-  <string name="status_shutting_down">TorService спира</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Неуспешно стартиране на Тор процес: </string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Твоята ReachableAddresses настройка предизвика грешка!</string>
-  <string name="your_relay_settings_caused_an_exception_">Твоите настройки за препращане предизвикаха изключение!</string>
-    <string name="found_existing_tor_process">намерил си съвместим Tor проект...</string>
-  <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string>
-    <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string>
-  <string name="unable_to_start_tor">Не може да стартира Тор:</string>
-    <string name="newnym">Сменихте своята Тор идентичност!</string>
-    <string name="updating_settings_in_tor_service">обновяване на настройките в Tor услугата</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-bn-rBD/strings.xml b/orbotmanager/src/main/res/values-bn-rBD/strings.xml
deleted file mode 100644
index 3f5d7d2e..00000000
--- a/orbotmanager/src/main/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">অরবট</string>
-  <string name="app_description">Orbot একটি ফ্রি প্রক্সি অ্যাপ্লিকেশন যা অন্যান্য Apps কে আরও নিরাপদভাবে ইন্টারনেট ব্যবহার করার ক্ষমতাপ্রদান করে।  Orbot আপনার ইন্টারনেট ট্রাফিক এনক্রিপ্ট করতে টর ব্যবহার এবং তারপর সারা বিশ্বের কম্পিউটারের সিরিজের moddho diye porichalito kore gopon kore. টর ফ্রি সফটওয়্যার এবং আপনি ট্রাফিক বিশ্লেষণ হিসেবে পরিচিত ব্যক্তিগত স্বাধীনতা ও গোপনীয়তা, গোপনীয় বাণিজ্যিক কার্যক্রম এবং সম্পর্ক, এবং রাষ্ট্রীয় নিরাপত্তা হুমকির মুখে পড়ে নেটওয়ার্ক নজরদারি একটি ফর্ম বিরুদ্ধে রক্ষা করতে সাহায্য করে যে একটি খোলা নেটওয়ার্ক.</string>
-    <string name="status_starting_up">অরবট চালু হচ্ছে . . . </string>
-  <string name="status_activated">টর নেটওয়ার্কের সাথে সংযুক্ত হয়েছে</string>
-  <string name="status_disabled">অরবট নিষ্ক্রিয় করা হয়েছে</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-bn-rIN/strings.xml b/orbotmanager/src/main/res/values-bn-rIN/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-bn-rIN/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-bn/strings.xml b/orbotmanager/src/main/res/values-bn/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-bn/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-brx/strings.xml b/orbotmanager/src/main/res/values-brx/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-brx/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-bs/strings.xml b/orbotmanager/src/main/res/values-bs/strings.xml
deleted file mode 100644
index 0fe1e9e1..00000000
--- a/orbotmanager/src/main/res/values-bs/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-ca/strings.xml b/orbotmanager/src/main/res/values-ca/strings.xml
deleted file mode 100644
index 60195126..00000000
--- a/orbotmanager/src/main/res/values-ca/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">L\'Orbot s\'està iniciant...</string>
-  <string name="status_activated">Esteu connectat a la xarxa Tor</string>
-  <string name="status_disabled">L\'Orbot està desactivat</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">No s\'ha pogut iniciar el procés Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Els paràmetres d\'adreces accessibles han provocat una excepció.</string>
-  <string name="your_relay_settings_caused_an_exception_">Els paràmetres de reemissió han causat una excepció.</string>
-    <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent...</string>
-  <string name="something_bad_happened">Ha fallat alguna cosa. Comproveu el registre</string>
-    <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
-  <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
-    <string name="newnym">Heu canviat a una nova identitat Tor.</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-cs-rCZ/strings.xml b/orbotmanager/src/main/res/values-cs-rCZ/strings.xml
deleted file mode 100644
index c997196e..00000000
--- a/orbotmanager/src/main/res/values-cs-rCZ/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot se spouští...</string>
-  <string name="status_activated">Připojen k síti Tor</string>
-  <string name="status_disabled">Orbot je deaktivován</string>
-  <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Nelze spustit Tor proces:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše nastavení dostupných adres (ReachableAddresses) způsobilo chybu!</string>
-  <string name="your_relay_settings_caused_an_exception_">Vaše nastavení relace způsobilo výjimku!</string>
-    <string name="found_existing_tor_process">nalezev existující Tor proces…</string>
-  <string name="something_bad_happened">Stalo se něco špatného. Zkontrolujte log</string>
-    <string name="unable_to_read_hidden_service_name">nelze číst název skryté služby</string>
-  <string name="unable_to_start_tor">Nelze spustit Tor:</string>
-    <string name="newnym">Vaše identita na Toru byla změněna!</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-cs/strings.xml b/orbotmanager/src/main/res/values-cs/strings.xml
deleted file mode 100644
index 3cb27925..00000000
--- a/orbotmanager/src/main/res/values-cs/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot se spouští…</string>
-  <string name="status_activated">Připojen k síti Tor</string>
-  <string name="status_disabled">\"Orbot je deaktivován</string>
-  <string name="status_shutting_down">Orbot se vypíná</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-cy/strings.xml b/orbotmanager/src/main/res/values-cy/strings.xml
deleted file mode 100644
index 0b48c553..00000000
--- a/orbotmanager/src/main/res/values-cy/strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Mae Orbot yn cychwyn...</string>
-  <string name="status_activated">Wedi cysylltu â rhwydwaith Tor</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-da/strings.xml b/orbotmanager/src/main/res/values-da/strings.xml
deleted file mode 100644
index 7abda071..00000000
--- a/orbotmanager/src/main/res/values-da/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot er en gratis og åben proxy-applikation, der gør det muligt at anvende internettet mere sikkert fra andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor er gratis og åben software, der kan hjælpe dig mod netværksovervågning kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, handelsaktivitet og forhold.</string>
-    <string name="status_starting_up">Orbot starter op ...</string>
-  <string name="status_activated">Der er forbindelse til Tor-netværket</string>
-  <string name="status_disabled">Orbot er slået fra</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor processen:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Din ReachableAdresses indstilling forudsagede en fejl!</string>
-  <string name="your_relay_settings_caused_an_exception_">Dine relæindstillinger forårsagede en fejl!</string>
-    <string name="found_existing_tor_process">fandt eksisterende Tor process...</string>
-  <string name="something_bad_happened">Noget slemt er sket. Check loggen</string>
-    <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
-  <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-de-rAT/strings.xml b/orbotmanager/src/main/res/values-de-rAT/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-de-rAT/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-de/strings.xml b/orbotmanager/src/main/res/values-de/strings.xml
deleted file mode 100644
index 42e901f4..00000000
--- a/orbotmanager/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot ist eine kostenlose Proxy-Anwendung, mit deren Hilfe andere Anwendungen das Internet sicherer nutzen können. Orbot verwendet Tor, um Ihren Internetverkehr zu verschlüsseln und ihn dann zu verbergen, indem er über eine Reihe weltweit verteilter Computer geleitet wird. Tor ist ein freies Programm und ein offenes Netzwerk, das Ihnen hilft, sich gegen Angriffe auf die persönliche Freiheit und die Privatsphäre oder auf vertrauliche Geschäftsbeziehungen sowie gegen die Datenüberwachung aus Staatssicherheitsgründen zu wehren.</string>
-    <string name="status_starting_up">Orbot startet …</string>
-  <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string>
-  <string name="status_disabled">Orbot ist deaktiviert</string>
-  <string name="status_shutting_down">TorService wird heruntergefahren</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tor-Prozess konnte nicht gestartet werden:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellten erreichbaren Adressen haben einen Ausnahmefehler verursacht!</string>
-  <string name="your_relay_settings_caused_an_exception_">Ihre Relaiseinstellungen haben einen Ausnahmefehler verursacht!</string>
-    <string name="found_existing_tor_process">bestehender Tor-Prozess gefunden …</string>
-  <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll prüfen</string>
-    <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
-  <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
-    <string name="newnym">Sie haben zu einer neuen Tor-Identität gewechselt!</string>
-    <string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-el/strings.xml b/orbotmanager/src/main/res/values-el/strings.xml
deleted file mode 100644
index 1241bdf9..00000000
--- a/orbotmanager/src/main/res/values-el/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Το Orbot ξεκινά</string>
-  <string name="status_activated">Συνδέθηκε στο δίκτυο Tor</string>
-  <string name="status_disabled">\"Το Orbot είναι Απενεργοποιημένο</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Αδυναμία εκκίνησης της διεργασίας Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Οι ρυθμίσεις ReachableAddresses προκάλεσαν μια εξαίρεση!</string>
-  <string name="your_relay_settings_caused_an_exception_">Οι ρυθμίσεις αναμεταδότη σας προκάλεσαν μια εξαίρεση!</string>
-    <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor...</string>
-  <string name="something_bad_happened">Κάτι κακό συνέβη. Ελέγξτε τις καταγραφές</string>
-    <string name="unable_to_read_hidden_service_name">αδυναμία ανάγνωσης του ονόματος της κρυφής υπηρεσίας</string>
-  <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
-    <string name="newnym">Έχετε αλλάξει επιτυχώς την ταυτότητα σας στο Tor! </string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-en-rGB/strings.xml b/orbotmanager/src/main/res/values-en-rGB/strings.xml
deleted file mode 100644
index 05e2b960..00000000
--- a/orbotmanager/src/main/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-eo/strings.xml b/orbotmanager/src/main/res/values-eo/strings.xml
deleted file mode 100644
index b3e4bf94..00000000
--- a/orbotmanager/src/main/res/values-eo/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot ŝaltiĝas...</string>
-  <string name="status_activated">Konektita al Tor-reto</string>
-  <string name="status_disabled">Orbot estas malaktivigita</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tor-procedo ne sukcesis stariĝi:</string>
-    <string name="your_relay_settings_caused_an_exception_">Via agordo de relajso kaŭzis escepton!</string>
-    <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</string>
-    <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaŝita servo</string>
-  <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-es-rAR/strings.xml b/orbotmanager/src/main/res/values-es-rAR/strings.xml
deleted file mode 100644
index 1763d99f..00000000
--- a/orbotmanager/src/main/res/values-es-rAR/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot está iniciándose...</string>
-  <string name="status_activated">Conectado a la red Tor</string>
-  <string name="status_disabled">\"Orbot está Desactivado</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-    <string name="unable_to_start_tor">No se puede iniciar Tor:</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-es/strings.xml b/orbotmanager/src/main/res/values-es/strings.xml
deleted file mode 100644
index 981f39c6..00000000
--- a/orbotmanager/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot es una aplicación libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma más segura. Orbot utiliza Tor para cifrar su tráfico de Internet, y luego lo oculta rebotándolo a través de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como análisis de tráfico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string>
-    <string name="status_starting_up">Orbot está iniciandose...</string>
-  <string name="status_activated">Conectado a la red Tor</string>
-  <string name="status_disabled">Orbot está desactivado</string>
-  <string name="status_shutting_down">TorService se está cerrando</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">¡Sus \'Reglas de direcciones accesibles\' han producido una excepción!</string>
-  <string name="your_relay_settings_caused_an_exception_">¡La configuración de su repetidor ha producido una excepción!</string>
-    <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
-  <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
-    <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
-  <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
-    <string name="newnym">¡Ha cambiado a una nueva identidad de Tor!</string>
-    <string name="updating_settings_in_tor_service">actualizando la configuración en el servicio Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-et/strings.xml b/orbotmanager/src/main/res/values-et/strings.xml
deleted file mode 100644
index 1843e29f..00000000
--- a/orbotmanager/src/main/res/values-et/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot käivitub...</string>
-  <string name="status_activated">Ühendatud Tor võrgustikku</string>
-  <string name="status_disabled">Orbot deaktiveeritud</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tor protsessi käivitamine ebaõnnestus:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Teie ReachableAddresses seadistus põhjustas ekse!</string>
-  <string name="your_relay_settings_caused_an_exception_">Teie releeseadistus põhjustas ekse!</string>
-    <string name="found_existing_tor_process">leidus töötav Tor protsess...</string>
-  <string name="something_bad_happened">Juhtus midagi halba. Kontrollige logi</string>
-    <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
-  <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
-    <string name="newnym">Lülitusite uuele Tor identiteedile!</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-eu/strings.xml b/orbotmanager/src/main/res/values-eu/strings.xml
deleted file mode 100644
index e1e0bed2..00000000
--- a/orbotmanager/src/main/res/values-eu/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot abiarazten ari da...</string>
-  <string name="status_activated">Tor sarera konektatuta</string>
-  <string name="status_disabled">\"Orbot desaktibatuta dago</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Zure helbide atzigarriak salbuespena sortu du!</string>
-  <string name="your_relay_settings_caused_an_exception_">Zure errele ezarpenak salbuespena sortu dute!</string>
-    <string name="found_existing_tor_process">Aurreko Tor prozesua topatuta...</string>
-  <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu logetan</string>
-    <string name="unable_to_read_hidden_service_name">ezkutuko zerbitzuare izena ezin da irakurri</string>
-  <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
-    <string name="newnym">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-fa/strings.xml b/orbotmanager/src/main/res/values-fa/strings.xml
deleted file mode 100644
index fad3a175..00000000
--- a/orbotmanager/src/main/res/values-fa/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">ربات پیازی</string>
-  <string name="app_description">اربت یک برنامه پروکسی مجانی است که دیگر برنامه ها را به استفاده امن از اینترنت توانمند می کند . اربوت از تور برای رمزگذاری کردن ترافیک اینترنت شما استفاده می کند و بعد آن ها را از طریق کامپیوترهای متفاوت در نقاط مختلف جهان مخفی می کند. تور یک برنامه مجانی و شبکه باز است که شما از شما در مقابل تحت نظر بودن در شبکه٬‌  تهدید آزادی های شخصی٬ خصوصی٬ فعالیت های کاری و رابطه های شخصی بطور امن محافظت می کند. </string>
-    <string name="status_starting_up">اربوت درحال آغاز است...</string>
-  <string name="status_activated">متصل به شبکه تور</string>
-  <string name="status_disabled">اربوت غیرفعال شده است.</string>
-  <string name="status_shutting_down">TorService خاموش است</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_"> تور نتواست اجرا شود:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">تنظیمات شما برای آدرس قابل دسترسی باعث ایجاد خطا شده اند !</string>
-  <string name="your_relay_settings_caused_an_exception_">تنظیمات رله شما موجب خطا شده اند</string>
-    <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد...</string>
-  <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
-    <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string>
-  <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
-    <string name="newnym">شما به شناسه جدید تور منتقل شدید</string>
-    <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-fi/strings.xml b/orbotmanager/src/main/res/values-fi/strings.xml
deleted file mode 100644
index ba45a7b9..00000000
--- a/orbotmanager/src/main/res/values-fi/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot on ilmainen välityspalvelinsovellus, joka tarjoaa muille sovelluksille mahdollisuuden käyttää internetiä turvallisemmin. Orbot käyttää Toria kryptaamaan verkkoliikenteesi ja sitten piilottaa sen kierrättämällä sitä usean tietokoneen kautta ympäri maailman. Tor on vapaa ohjelmisto ja avoin verkosto, jotka auttavat puolustautumaan vapautta ja yksityisyyttä uhkaavalta verkkovalvonnalta ja valtioiden verkonseurannalta sekä suojaamaan salaisia liiketoimintoja ja -yhteyksiä.</string>
-    <string name="status_starting_up">Orbot käynnistyy...</string>
-  <string name="status_activated">Yhdistetty Tor-verkkoon</string>
-  <string name="status_disabled">Orbot on poistettu käytöstä</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tor-prosessin käynnistäminen epäonnistui:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">ReachableAccess-asetuksesi aiheuttivat virheen!</string>
-  <string name="your_relay_settings_caused_an_exception_">Releasetuksesi aiheuttivat virheen!</string>
-    <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
-  <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string>
-    <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
-  <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
-    <string name="newnym">Vaihdoit Tor-identiteettisi uuteen!</string>
-    <string name="updating_settings_in_tor_service">päivitetään Tor-palvelun asetuksia</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-fr-rFR/strings.xml b/orbotmanager/src/main/res/values-fr-rFR/strings.xml
deleted file mode 100644
index f6031429..00000000
--- a/orbotmanager/src/main/res/values-fr-rFR/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis d\'utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers d\'ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et l\'analyse du trafic des gouvernements.</string>
-    <string name="status_starting_up">Orbot démarre...</string>
-  <string name="status_activated">Connecté au réseau Tor</string>
-  <string name="status_disabled">Orbot est désactivé</string>
-  <string name="status_shutting_down">TorService est en cours d\'extinction</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Vos paramètres ReachableAddresses (adresses accessibles) ont causé une exception !</string>
-  <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont causé une exception !</string>
-    <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
-  <string name="something_bad_happened">Quelque chose n\'a pas été. Vérifiez le journal</string>
-    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
-  <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
-    <string name="newnym">Vous avez basculé vers une nouvelle identité Tor !</string>
-    <string name="updating_settings_in_tor_service">mise à jour des paramètres dans le service Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-fr/strings.xml b/orbotmanager/src/main/res/values-fr/strings.xml
deleted file mode 100644
index 328224b6..00000000
--- a/orbotmanager/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot est une application proxy gratuite qui améliore l\'utilisation plus sécurisée des applications. Orbot utilise Tor pour crypter votre trafic internet et le cacher en passant par une série d\'ordinateur partout dans le monde. Tor est un logiciel gratuit et un réseau ouvert qui vous aide à vous défendre contre les surveillances de réseau qui font peur à la liberté personnelle et la vie privée, les activités confidentielles des entreprises et des relations, et l\'état de la sécurité connu sous le nom d\'analyse de trafic.</string>
-    <string name="status_starting_up">Démarrage de Orbot...</string>
-  <string name="status_activated">Connecté au réseau Tor</string>
-  <string name="status_disabled">Orbot est désactivé</string>
-  <string name="status_shutting_down">Le service Tor est en cours de fermeture</string>
-    <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-gl/strings.xml b/orbotmanager/src/main/res/values-gl/strings.xml
deleted file mode 100644
index e43495be..00000000
--- a/orbotmanager/src/main/res/values-gl/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot é unha aplicación de proxy libre que permite a outras aplicacións usar a internet dun xeito máis seguro. Orbot usa Tor para encriptar o teu tráfico de internet ocultando e rebotándoo a través dunha serie de ordenadores ao redor do mundo. Tor é software libre e unha rede aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza a liberdade e privacidade persoal, actividades confidenciáis de negocios e relacións, e estado de seguridade coñecido como análise de tráfico.</string>
-    <string name="status_starting_up">Orbot está a se iniciar...</string>
-  <string name="status_activated">Conectado á rede Tor</string>
-  <string name="status_disabled">Orbot está desactivado</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">No se pudio inciar o proceso Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">O seu axuste de ReachableAddresses causou unha excepción!</string>
-  <string name="your_relay_settings_caused_an_exception_">Os seus axustes de relay causou unha excepción!</string>
-    <string name="found_existing_tor_process">atopado proceso Tor existente...</string>
-  <string name="something_bad_happened">Algo malo pasou. Comprobe o rexistro</string>
-    <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
-  <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
-    <string name="newnym">Cambiou a unha nova identidade Tor!</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-gu-rIN/strings.xml b/orbotmanager/src/main/res/values-gu-rIN/strings.xml
deleted file mode 100644
index 0fe1e9e1..00000000
--- a/orbotmanager/src/main/res/values-gu-rIN/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-gu/strings.xml b/orbotmanager/src/main/res/values-gu/strings.xml
deleted file mode 100644
index 0fe1e9e1..00000000
--- a/orbotmanager/src/main/res/values-gu/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-he/strings.xml b/orbotmanager/src/main/res/values-he/strings.xml
deleted file mode 100644
index aa7e87ea..00000000
--- a/orbotmanager/src/main/res/values-he/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot הינה אפליקציית פרוקסי חינמית המאפשרת לאפליקציות אחרות להשתמש באינטרנט בבטחה. Orbot נעזרת ב-Tor כדי להצפין את תעבורת האינטרנט שלך ולהסוותה באמצעותה ניתובה דרך מספר מחשבים ברחבי העולם. Tor היא תוכנה חופשית ורשת פתוחה המסייעת לך להתגונן מפני סוגים מסוימים של אמצעי ניטור ומעקב אחר רשת האינטרנט המאיימים על הפרטיות, החירות האישית, פעילויות עסקיות ומערכות יחסים חשאיות.</string>
-    <string name="status_starting_up">Orbot מתחיל…</string>
-  <string name="status_activated">מחובר לרשת Tor</string>
-  <string name="status_disabled">Orbot כבוי</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string>
-    <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
-  <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
-    <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string>
-  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
-    <string name="newnym">החלפת אל זהות Tor חדשה!</string>
-    <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-hi/strings.xml b/orbotmanager/src/main/res/values-hi/strings.xml
deleted file mode 100644
index a3437449..00000000
--- a/orbotmanager/src/main/res/values-hi/strings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">औरबौट एक मुफ्त अैप</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-hr-rHR/strings.xml b/orbotmanager/src/main/res/values-hr-rHR/strings.xml
deleted file mode 100644
index b80fb51c..00000000
--- a/orbotmanager/src/main/res/values-hr-rHR/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-hr/strings.xml b/orbotmanager/src/main/res/values-hr/strings.xml
deleted file mode 100644
index 1e9d6f57..00000000
--- a/orbotmanager/src/main/res/values-hr/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot je besplatna proxy aplikacija koja omogućuje ostalim aplikacijama da koriste internet sigurnije. Orbot koristi Tor za enkripciju Vašeg Internet prometa, a zatim ga skriva šaljući ga kroz seriju računala diljem svijeta. Tor je besplatan software i otvorena mreža koja pomaže u borbi protiv nadzora mreže koji ugrožava osobne slobode i privatnost, povjerljive poslovne aktivnosti i odnose, te pomaže u borbi protiv analize prometa.</string>
-    <string name="status_starting_up">Orbot se pokreće...</string>
-  <string name="status_activated">Spojen na Tor mrežu</string>
-  <string name="status_disabled">Orbot je deaktiviran</string>
-  <string name="status_shutting_down">TorService se gasi</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Nije moguće započeti Tor proces:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše ReachableAddresses postavke su uzrokovale iznimku!</string>
-  <string name="your_relay_settings_caused_an_exception_">Vaše postavke releja su uzrokovale iznimku!</string>
-    <string name="found_existing_tor_process">pronađeni postojeći Tor procesi...</string>
-  <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string>
-    <string name="unable_to_read_hidden_service_name">nije moguće pročitati ime skrivene usluge</string>
-  <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
-    <string name="newnym">Prebacili ste se na nov Tor identitet!</string>
-    <string name="updating_settings_in_tor_service">ažuriram postavke u Tor usluzi</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-hu/strings.xml b/orbotmanager/src/main/res/values-hu/strings.xml
deleted file mode 100644
index 440f4022..00000000
--- a/orbotmanager/src/main/res/values-hu/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Az Orbot egy ingyenes proxy alkalmazás, ami képessé tesz alkalmazásokat, hogy biztonságosabban használhassák az internetet. Az Orbot Tor-t használ, hogy titkosítsa az internetforgalmadat és elrejtse azáltal, hogy pattogtatja számítógépek sorozatain keresztül a világ körül. A Tor ingyenes szoftver és nyitott hálózat, ami segít megvédeni a hálózati felügyelettől, ami fenyegeti a személyi szabadságot és magánéletet, a bizalmas céges tevékenységeket és kapcsolatokat, és állambiztonság címén a forgalomelemzéstől.</string>
-    <string name="status_starting_up">Az Orbot indul...</string>
-  <string name="status_activated">Csatlakozva a Tor hálózathoz</string>
-  <string name="status_disabled">Az Orbot deaktiválva</string>
-  <string name="status_shutting_down">A TorService leáll</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Nem indítható el a Tor folyamat:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Az elérhető címeid beállításai kivételt okoztak!</string>
-  <string name="your_relay_settings_caused_an_exception_">Az átjátszód beállításai kivételt okoztak!</string>
-    <string name="found_existing_tor_process">létező Tor folyamat találva...</string>
-  <string name="something_bad_happened">Valami rossz történt. Nézd meg a naplót.</string>
-    <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
-  <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
-    <string name="newnym">Új Tor identitásra váltottál!</string>
-    <string name="updating_settings_in_tor_service">a Tor szolgáltatás beállításainak frissítése</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-hy-rAM/strings.xml b/orbotmanager/src/main/res/values-hy-rAM/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-hy-rAM/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-ia/strings.xml b/orbotmanager/src/main/res/values-ia/strings.xml
deleted file mode 100644
index b80fb51c..00000000
--- a/orbotmanager/src/main/res/values-ia/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-id/strings.xml b/orbotmanager/src/main/res/values-id/strings.xml
deleted file mode 100644
index 61f38f07..00000000
--- a/orbotmanager/src/main/res/values-id/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
-    <string name="status_starting_up">Orbot sedang dimulai...</string>
-  <string name="status_activated">Tersambung ke Jaringan Tor</string>
-  <string name="status_disabled">Orbot telah dibatalkan</string>
-  <string name="status_shutting_down">TorService dimatikan</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
-  <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
-    <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
-  <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
-    <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
-    <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-in-rID/strings.xml b/orbotmanager/src/main/res/values-in-rID/strings.xml
deleted file mode 100644
index 61f38f07..00000000
--- a/orbotmanager/src/main/res/values-in-rID/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
-    <string name="status_starting_up">Orbot sedang dimulai...</string>
-  <string name="status_activated">Tersambung ke Jaringan Tor</string>
-  <string name="status_disabled">Orbot telah dibatalkan</string>
-  <string name="status_shutting_down">TorService dimatikan</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
-  <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
-    <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
-  <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
-    <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
-    <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-in/strings.xml b/orbotmanager/src/main/res/values-in/strings.xml
deleted file mode 100644
index 6ad2270a..00000000
--- a/orbotmanager/src/main/res/values-in/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot sedang dimulai…</string>
-  <string name="status_activated">Tersambung ke Jaringan Tor</string>
-  <string name="status_disabled">Orbot telah dibatalkan</string>
-  <string name="status_shutting_down">Orbot sedang dimatikan</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-is/strings.xml b/orbotmanager/src/main/res/values-is/strings.xml
deleted file mode 100644
index 90f75a88..00000000
--- a/orbotmanager/src/main/res/values-is/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot er ókeypis proxy smáforrit sem gerir öðrum smáforritum kleift að nota veraldarvefinn á öruggari hátt. Orbot notar Tor til að dulkóða umferð þína á netinu og felur hana svo með að hoppa í gegnum fjölda tölva um allan heim. Tor er ókeypis hugbúnaður og opið net sem aðstoðar þig við að verjast gegn eftirliti á netinu sem vinnur gegn frelsi einkalífsins og friðhelgi, trúnaðar viðskiptamálum og samböndum, og ríkisöryggi þekkt sem umferðargreining.</string>
-    <string name="status_starting_up">Orbot er að ræsa...</string>
-  <string name="status_activated">Tengdur við Tor netið</string>
-  <string name="status_disabled">Orbot er slökkt</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Gat ekki kveikt á Tor þráð:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Þitt ReachableAddressur stillingar ollu undanþágu!</string>
-  <string name="your_relay_settings_caused_an_exception_">Endurvarp stillingar þínar ollu undanþágu!</string>
-    <string name="found_existing_tor_process">fann annan Tor þráð...</string>
-  <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu skráninguna</string>
-    <string name="unable_to_read_hidden_service_name">get ekki lesið nafn földu þjónustunnar</string>
-  <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string>
-    <string name="newnym">Þú ert komin með nýtt Tor auðkenni!</string>
-    <string name="updating_settings_in_tor_service">uppfæri stillingar í Tor þjónustu</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-it/strings.xml b/orbotmanager/src/main/res/values-it/strings.xml
deleted file mode 100644
index 734e80b7..00000000
--- a/orbotmanager/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot è un\'applicazione proxy che permette alle altre applicazioni di accedere a internet in maniera più sicura. Orbot usa Tor per cifrare il  traffico internet e lo nasconde poi facendolo rimbalzare attraverso una serie di computer attorno al mondo. Tor è un software libero e una rete aperta che aiuta a difendersi da una forma di sorveglianza della rete conosciuta come analisi del traffico. Quest\'ultima minaccia libertà e privacy personale, attività commerciali riservate, rapporti interpersonali, e persino la sicurezza di stato.</string>
-    <string name="status_starting_up">Orbot è in esecuzione...</string>
-  <string name="status_activated">Connesso alla rete Tor</string>
-  <string name="status_disabled">\"Orbot è disattivato</string>
-  <string name="status_shutting_down">TorService si sta spegnendo</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Impossibile avviare il processo Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">La tua configurazione dell\'indirizzo raggiungibile ha causato un\'eccezione!</string>
-  <string name="your_relay_settings_caused_an_exception_">La configurazione del tuo relay ha causato un\'eccezione!</string>
-    <string name="found_existing_tor_process">trovato un processo Tor esistente...</string>
-  <string name="something_bad_happened">E\' accaduto un evento indesiderato. Controllare i log.</string>
-    <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
-  <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
-    <string name="newnym">Sei passato a una nuova identità Tor!</string>
-    <string name="updating_settings_in_tor_service">aggiornamento impostazioni nel servizio Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-iw/strings.xml b/orbotmanager/src/main/res/values-iw/strings.xml
deleted file mode 100644
index aa7e87ea..00000000
--- a/orbotmanager/src/main/res/values-iw/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot הינה אפליקציית פרוקסי חינמית המאפשרת לאפליקציות אחרות להשתמש באינטרנט בבטחה. Orbot נעזרת ב-Tor כדי להצפין את תעבורת האינטרנט שלך ולהסוותה באמצעותה ניתובה דרך מספר מחשבים ברחבי העולם. Tor היא תוכנה חופשית ורשת פתוחה המסייעת לך להתגונן מפני סוגים מסוימים של אמצעי ניטור ומעקב אחר רשת האינטרנט המאיימים על הפרטיות, החירות האישית, פעילויות עסקיות ומערכות יחסים חשאיות.</string>
-    <string name="status_starting_up">Orbot מתחיל…</string>
-  <string name="status_activated">מחובר לרשת Tor</string>
-  <string name="status_disabled">Orbot כבוי</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string>
-    <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
-  <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
-    <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string>
-  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
-    <string name="newnym">החלפת אל זהות Tor חדשה!</string>
-    <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-ja/strings.xml b/orbotmanager/src/main/res/values-ja/strings.xml
deleted file mode 100644
index 4a536bc0..00000000
--- a/orbotmanager/src/main/res/values-ja/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbotは他のアプリがインターネットをより安全に使うことを可能にするフリーのプロキシアプリです。Orbotでは、Torを用いてあなたの端末のトラフィックを暗号化し、世界中のコンピューターを中継することで、そのトラフィックを隠します。Torはフリーのソフトウェアとオープンなネットワークであり、ユーザーの自由とプライバシーを脅かす監視活動や、機密のビジネス活動、国家によるトラフィック分析から身を守ることを助けてくれます。</string>
-    <string name="status_starting_up">Orbotが開始されています...</string>
-  <string name="status_activated">Torネットワークに接続しています</string>
-  <string name="status_disabled">\"Orbotが解除されました</string>
-  <string name="status_shutting_down">TorServiceが終了しています</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Torプロセスの起動に失敗:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">あなたのReachableAddresses設定により例外が発生しました!</string>
-  <string name="your_relay_settings_caused_an_exception_">あなたのリレー設定により例外が発生しました!</string>
-    <string name="found_existing_tor_process">Torプロセスを発見</string>
-  <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string>
-    <string name="unable_to_read_hidden_service_name">hidden serviceの名前読込不能</string>
-  <string name="unable_to_start_tor">Torを実行できませんでした</string>
-    <string name="newnym">新たな Tor の身元に切り替えました。</string>
-    <string name="updating_settings_in_tor_service">Torサービスの設定を更新中</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-kn-rIN/strings.xml b/orbotmanager/src/main/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-kn/strings.xml b/orbotmanager/src/main/res/values-kn/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-kn/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-ko/strings.xml b/orbotmanager/src/main/res/values-ko/strings.xml
deleted file mode 100644
index 0e420193..00000000
--- a/orbotmanager/src/main/res/values-ko/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot 시작 중…</string>
-  <string name="status_activated">Tor 네트워크에 연결됨</string>
-  <string name="status_disabled">Orbot이 비활성화되어 있습니다</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tor 프로세스 시작 불가능:  </string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">귀하의 ReachableAddress 설정은 예외를 발생시켰습니다!</string>
-  <string name="your_relay_settings_caused_an_exception_">귀하의 중계서버 설정은 예외를 발생시켰습니다!</string>
-    <string name="found_existing_tor_process">존재하고 있는 Tor 프로세스 발견</string>
-  <string name="something_bad_happened">어떤 나쁜 것이 발생. 로그 확인하세요.</string>
-    <string name="unable_to_read_hidden_service_name">히든 서비스 이름을 읽을 수 없음</string>
-  <string name="unable_to_start_tor">Tor 시작 불가능</string>
-    <string name="newnym">새로운 Tor 신원으로 전환되었습니다!</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-ky/strings.xml b/orbotmanager/src/main/res/values-ky/strings.xml
deleted file mode 100644
index 05e2b960..00000000
--- a/orbotmanager/src/main/res/values-ky/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-lt-rLT/strings.xml b/orbotmanager/src/main/res/values-lt-rLT/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-lt-rLT/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-lt/strings.xml b/orbotmanager/src/main/res/values-lt/strings.xml
deleted file mode 100644
index 938fc431..00000000
--- a/orbotmanager/src/main/res/values-lt/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-lv/strings.xml b/orbotmanager/src/main/res/values-lv/strings.xml
deleted file mode 100644
index abf085b5..00000000
--- a/orbotmanager/src/main/res/values-lv/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot ir starpniekserveru bezmaksas lietotne, kas sniedz iespēju citām lietotnēm drošāk lietot internetu. Orbot izmanto Tor, lai šifrētu Jūsu interneta datplūsmu, tad to paslēpj, pārsūtot to caur daudziem datoriem visā pasaulē. Tor ir bezmaksas programmatūra un atvērts tīkls, kas palīdz Jums aizsargāties pret tīkla uzraudzības veidu - datplūsmas analīzi -, ar kuras palīdzību tiek apdraudēta personiskā brīvība un privātums, konfidenciālas lietišķas darbības un attiecības, kā arī valsts drošība.  </string>
-    <string name="status_starting_up">Orbot startē...</string>
-  <string name="status_activated">Izveidots savienojums ar tīklu Tor</string>
-  <string name="status_disabled">Orbot ir deaktivēts</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Neizdevās palaist Tor\'a procesu:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Jūsu ReachableAddresses iestatījumi izraisīja izņēmuma stāvokli!</string>
-  <string name="your_relay_settings_caused_an_exception_">Jūsu retranslatora iestatījumi izraisīja izņēmuma situāciju!</string>
-    <string name="found_existing_tor_process">Atrada esošu Tor procesu...</string>
-  <string name="something_bad_happened">Nav labi. Pārbaudiet žurnālu</string>
-    <string name="unable_to_read_hidden_service_name">Nespēj lasīt slēpta pakalpojuma nosaukumu</string>
-  <string name="unable_to_start_tor">Nevar startēt Tor:</string>
-    <string name="newnym">Jūs pārslēdzāties uz jaunu Tor\'a identitāti!</string>
-    <string name="updating_settings_in_tor_service">atjaunina Tor pakalpojuma iestatījumus </string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-mk/strings.xml b/orbotmanager/src/main/res/values-mk/strings.xml
deleted file mode 100644
index dfc09fe3..00000000
--- a/orbotmanager/src/main/res/values-mk/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot е слободна прокси апликација која им овозможува на другите апликации да го користат интернетот побезбедно. Orbot користи Tor за шифрирање на интернет-сообраќајот, а потоа го сокрива и го доставува преку неколку компјутери во целиот свет. Tor е слободен софтвер и отворена мрежа која се справува со вид надзор на мрежата која штети на личната слобода и приватноста, доверливи деловни активности и односи, и државната безбедност позната како анализа на сообраќајот.</string>
-    <string name="status_starting_up">Орбот се стартува...</string>
-  <string name="status_activated">Поврзан на мрежата на Tor</string>
-  <string name="status_disabled">Орбот е деактивиран</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Не може да се започне Tor-процесот:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Вашите поставки за достапните адреси предизвикаа грешка!</string>
-  <string name="your_relay_settings_caused_an_exception_">Вашите поставки за реле предизвикаа грешка!</string>
-    <string name="found_existing_tor_process">Пронајден постоечки Tor-процес ...</string>
-  <string name="something_bad_happened">Настана грешка. Проверете во дневникот</string>
-    <string name="unable_to_read_hidden_service_name">не може да се прочита името на скриениот сервис</string>
-  <string name="unable_to_start_tor">Tor не може да се стартува:</string>
-    <string name="newnym">Се префрливте на нов идентитет на Tor!</string>
-    <string name="updating_settings_in_tor_service">ажурирање на поставките во сервисот Tor </string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-ml/strings.xml b/orbotmanager/src/main/res/values-ml/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-ml/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-mn/strings.xml b/orbotmanager/src/main/res/values-mn/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-mn/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-mr-rIN/strings.xml b/orbotmanager/src/main/res/values-mr-rIN/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-mr-rIN/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-ms-rMY/strings.xml b/orbotmanager/src/main/res/values-ms-rMY/strings.xml
deleted file mode 100644
index 4ca71d26..00000000
--- a/orbotmanager/src/main/res/values-ms-rMY/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot telah dimulakan..</string>
-  <string name="status_activated">Bersambung ke rangkaian Tor</string>
-  <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
-  <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
-    <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
-  <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-ms/strings.xml b/orbotmanager/src/main/res/values-ms/strings.xml
deleted file mode 100644
index badbaf86..00000000
--- a/orbotmanager/src/main/res/values-ms/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot telah dimulakan..</string>
-  <string name="status_activated">Bersambung ke rangkaian Tor</string>
-  <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
-  <string name="status_shutting_down">Orbot sedang ditutup</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
-  <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
-    <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
-  <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
-  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-my/strings.xml b/orbotmanager/src/main/res/values-my/strings.xml
deleted file mode 100644
index b80fb51c..00000000
--- a/orbotmanager/src/main/res/values-my/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-nb/strings.xml b/orbotmanager/src/main/res/values-nb/strings.xml
deleted file mode 100644
index 5de62d07..00000000
--- a/orbotmanager/src/main/res/values-nb/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot er en gratis proxy app som gjør det mulig for andre apps å bruke internett mer sikkert. Orbot bruker Tor for å kryptere din Internettrafikk, og skjuler da din trafikk ved å sende trafikken gjennom en lang rekke datamaskiner over hele verden. Tor er et gratis dataprogram, og et åpent nettverk som hjelper deg å forsvare deg mot en form for nettverksovervåking som truer din personlige frihet og privatliv, konfidensiell bedriftsvirksomhet og relasjoner, og statlig sikkerhet kjent som trafikkanalyse.</string>
-    <string name="status_starting_up">Orbot starter...</string>
-  <string name="status_activated">Koblet til Tor-nettverket</string>
-  <string name="status_disabled">Orbot er deaktivert</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor prosessen:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Dine \"adresser som kan nås\"-innstillinger forårsaket et unntak!</string>
-  <string name="your_relay_settings_caused_an_exception_">Dine relé-innstillinger forårsaket et unntak!</string>
-    <string name="found_existing_tor_process">fant eksisterende Tor-prosess...</string>
-  <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
-    <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
-  <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
-    <string name="newnym">Du har byttet til en ny Tor-identitet!</string>
-    <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-nl/strings.xml b/orbotmanager/src/main/res/values-nl/strings.xml
deleted file mode 100644
index f670b300..00000000
--- a/orbotmanager/src/main/res/values-nl/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Genesis is een gratis en vrije proxy-app die het andere apps mogelijk maakt het internet veiliger te gebruiken. Orbot gebruikt Tor om je internetverkeer te coderen en het vervolgens te verhullen het door het door een serie computers over de hele wereld te routeren. Tor is vrije software en een open netwerk dat je helpt te verdedigen tegen een vorm van netwerktoezicht die persoonlijke vrijheid en privacy, vertrouwelijke bedrijfsactiviteiten en relaties en staatsveiligheid genaamd \'traffic analyse\' bedreigt.</string>
-    <string name="status_starting_up">Genesis is bezig met starten…</string>
-  <string name="status_activated">Verbonden met het Tor-netwerk</string>
-  <string name="status_disabled">Orbot is uitgeschakeld</string>
-  <string name="status_shutting_down">TorService wordt afgesloten</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Kon Tor-proces niet starten: </string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Je ReachableAddresses-instellingen veroorzaakten een fout!</string>
-  <string name="your_relay_settings_caused_an_exception_">Je relay-instellingen veroorzaakten een fout!</string>
-    <string name="found_existing_tor_process">bestaand Tor-proces gevonden…</string>
-  <string name="something_bad_happened">Er is een fout opgetreden. Controleer de log</string>
-    <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
-  <string name="unable_to_start_tor">Kan Tor niet starten:</string>
-    <string name="newnym">Je bent naar een nieuwe Tor identiteit gewisseld!</string>
-    <string name="updating_settings_in_tor_service">instellingen in Tor-dienst worden bijgewerkt</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-pa/strings.xml b/orbotmanager/src/main/res/values-pa/strings.xml
deleted file mode 100644
index 0fe1e9e1..00000000
--- a/orbotmanager/src/main/res/values-pa/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-pl/strings.xml b/orbotmanager/src/main/res/values-pl/strings.xml
deleted file mode 100644
index 6ea25936..00000000
--- a/orbotmanager/src/main/res/values-pl/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot jest darmową aplikacją proxy która wspomaga inne aplikacje do używania internetu bezpiecznie. Orbot używa Tora do szyfrowania Twojego ruchu internetowego i następnie przepuszczania go przez wiele innych komputereów pororzucanych na całym świecie. Tor jest darmowym oprogramowaniem i otwartą siecią która pomaga Tobie w obronie przed monitoringiem sieci która zagrarza osobistej wolności i prywatności, poufnym biznesowym aktywnościom.</string>
-    <string name="status_starting_up">Orbot startuje...</string>
-  <string name="status_activated">Podłączony do sieci Tor</string>
-  <string name="status_disabled">Orbot wyłączony</string>
-  <string name="status_shutting_down">TorService wyłącza się</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Nie można było zainicjować procesu Tora:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Twoje ustawienia dostępnych adresów spowodowały wyjątek!</string>
-  <string name="your_relay_settings_caused_an_exception_">Ustawienia Twojego przekaźnika spowodowały wyjątek!</string>
-    <string name="found_existing_tor_process">znaleziono istniejący proces Tora...</string>
-  <string name="something_bad_happened">Coś nie poszło nie tak. Sprawdź logi</string>
-    <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
-  <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
-    <string name="newnym">Nowa tożsamość Tor\'a została zmieniona!</string>
-    <string name="updating_settings_in_tor_service">aktualizowanie ustawień w serwisie Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-ps/strings.xml b/orbotmanager/src/main/res/values-ps/strings.xml
deleted file mode 100644
index 49c8dbc4..00000000
--- a/orbotmanager/src/main/res/values-ps/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-pt-rBR/strings.xml b/orbotmanager/src/main/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 847f7aef..00000000
--- a/orbotmanager/src/main/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot é um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais segurança. Orbot usa o Tor para criptografar seu tráfego na internet e então o esconde \"saltando\" entre uma série de computadores ao redor do mundo. Tor é um software livre e de rede aberta que ajuda você a se defender de certas formas de vigilância que ameaçam privacidade e liberdade pessoais, atividades e relações comerciais confidenciais e segurança estatal conhecida como análise de tráfego.</string>
-    <string name="status_starting_up">Orbot está iniciando...</string>
-  <string name="status_activated">Conectado à rede Tor</string>
-  <string name="status_disabled">Orbot está desativado</string>
-  <string name="status_shutting_down">TorService está desligando</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Suas configurações de Endereços Acessíveis causou uma exceção!</string>
-  <string name="your_relay_settings_caused_an_exception_">Suas configurações de retransmissão causaram uma exceção!</string>
-    <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
-  <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string>
-    <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
-  <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
-    <string name="newnym">Você trocou para uma nova identidade Tor!</string>
-    <string name="updating_settings_in_tor_service">atualizando configurações no serviço Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-pt-rPT/strings.xml b/orbotmanager/src/main/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 2f8e5113..00000000
--- a/orbotmanager/src/main/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-pt/strings.xml b/orbotmanager/src/main/res/values-pt/strings.xml
deleted file mode 100644
index 9266d81d..00000000
--- a/orbotmanager/src/main/res/values-pt/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">O Orbot está a iniciar...</string>
-  <string name="status_activated">Conetado à rede Tor</string>
-  <string name="status_disabled">O Orbot está desativado</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
-    <string name="found_existing_tor_process">encontrado o processo Tor existente...</string>
-  <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos.</string>
-    <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
-  <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
-    <string name="newnym">Mudou para uma nova identidade do Tor!</string>
-    <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-ro-rRO/strings.xml b/orbotmanager/src/main/res/values-ro-rRO/strings.xml
deleted file mode 100644
index b80fb51c..00000000
--- a/orbotmanager/src/main/res/values-ro-rRO/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-ro/strings.xml b/orbotmanager/src/main/res/values-ro/strings.xml
deleted file mode 100644
index 5b5d08c2..00000000
--- a/orbotmanager/src/main/res/values-ro/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot porneste...</string>
-  <string name="status_activated">Conectat la reteaua Tor</string>
-  <string name="status_disabled">Orbot este dezactivat</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Nu am putut porni procesul Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Setarile tale pentru adrese accesibile au cauzat o exceptie!</string>
-  <string name="your_relay_settings_caused_an_exception_">Setarile tale de relay au cauzat o exceptie!</string>
-    <string name="found_existing_tor_process">gasit proces Tor existent...</string>
-  <string name="something_bad_happened">Ceva rau s-a intamplat. Verifica log-ul</string>
-    <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
-  <string name="unable_to_start_tor">Nu am reusit sa pornesc Tor:</string>
-    <string name="newnym">Ați comutat la o nouă identitate Tor!</string>
-    <string name="updating_settings_in_tor_service">se actualizează configurările în serviciul Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-ru/strings.xml b/orbotmanager/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 2b0cca3f..00000000
--- a/orbotmanager/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot - это свободная программа для прокси-соединений, она позволяет другим приложениям более безопасно использовать интернет-соединение. Orbot использует Tor для шифрования интернет-трафика, который затем скрывается в ходе пересылки через несколько компьютеров в разных частях планеты. Tor является свободным программным приложением, а также открытой сетью, помогающей защититься от слежки в сетях, угрожающей личной свободе и частной жизни, конфиденциальным бизнес-деятельности и контактам, а также государственной программе безопасности, известной как анализ трафика.</string>
-    <string name="status_starting_up">Запуск Orbot...</string>
-  <string name="status_activated">Подключён к сети Tor</string>
-  <string name="status_disabled">Orbot отключён</string>
-  <string name="status_shutting_down">Служба Tor выключается</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Невозможно запустить Tor: </string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Ваши настройки доступных адресов вызвали исключение!</string>
-  <string name="your_relay_settings_caused_an_exception_">Настройки вашего ретранслятора вызвали исключение!</string>
-    <string name="found_existing_tor_process">найден существующий процесс Tor...</string>
-  <string name="something_bad_happened">Произошла какая-то ошибка. Проверьте журнал.</string>
-    <string name="unable_to_read_hidden_service_name">невозможно прочитать имя скрытой службы</string>
-  <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
-    <string name="newnym">Вы переключились на новый идентификатор Tor!</string>
-    <string name="updating_settings_in_tor_service">обновление настроек в сервисе Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-si-rLK/strings.xml b/orbotmanager/src/main/res/values-si-rLK/strings.xml
deleted file mode 100644
index 51c9389a..00000000
--- a/orbotmanager/src/main/res/values-si-rLK/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot ආරම්භ කරමින්…</string>
-  <string name="status_activated">Tor ජාලයට සබැදියි</string>
-  <string name="status_disabled">Orbot ක්‍රියාවිරහිත කර ඇත </string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tor ක්‍රියාවලින් ආරම්භ කිරීමට නොහැකි විය:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">ඔබේ සේන්දුවන ලිපිනයෙහි සිටුවම්වල ව්‍යතිරේකයක් හටගෙන ඇත!</string>
-  <string name="your_relay_settings_caused_an_exception_">ඔබේ ප්‍රතියෝජක සිටුවම්වල ව්‍යතිරේකයක් හටගෙන ඇත!</string>
-    <string name="found_existing_tor_process">පවතින Tor ක්‍රියාවලි හමුවිය...</string>
-  <string name="something_bad_happened">යම් නොමනා දෙයක් සිදුවිය. ලොගය පරික්ෂා කර බලන්න </string>
-    <string name="unable_to_read_hidden_service_name">සැගවුණු සේවා නාමය කියවීමට නොහැකිය </string>
-  <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-sk-rSK/strings.xml b/orbotmanager/src/main/res/values-sk-rSK/strings.xml
deleted file mode 100644
index 0fe1e9e1..00000000
--- a/orbotmanager/src/main/res/values-sk-rSK/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-sk/strings.xml b/orbotmanager/src/main/res/values-sk/strings.xml
deleted file mode 100644
index 996d73ee..00000000
--- a/orbotmanager/src/main/res/values-sk/strings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot štartuje…</string>
-  <string name="status_activated">Pripojený do Tor siete</string>
-  <string name="status_disabled">Orbot je deaktivovaný</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-sl/strings.xml b/orbotmanager/src/main/res/values-sl/strings.xml
deleted file mode 100644
index 7f1d22c5..00000000
--- a/orbotmanager/src/main/res/values-sl/strings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot se zaganja...</string>
-  <string name="status_activated">Povezan v omrežje Tor</string>
-  <string name="status_disabled">Orbot ni aktiviran</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-sn/strings.xml b/orbotmanager/src/main/res/values-sn/strings.xml
deleted file mode 100644
index 9b98a0c8..00000000
--- a/orbotmanager/src/main/res/values-sn/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-sq/strings.xml b/orbotmanager/src/main/res/values-sq/strings.xml
deleted file mode 100644
index b80fb51c..00000000
--- a/orbotmanager/src/main/res/values-sq/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-sr/strings.xml b/orbotmanager/src/main/res/values-sr/strings.xml
deleted file mode 100644
index ab08b3ec..00000000
--- a/orbotmanager/src/main/res/values-sr/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Орбот</string>
-  <string name="app_description">Орбот је бесплатна прокси апликација која даје моћ другим апликацијама да безбедније користе интернет. Орбот користи Тор за шифровање вашег интернет саобраћаја и онда га скрива слањем кроз низ рачунара широм света. Тор је слободан софтвер и отворена мрежа која помаже да се одбраните од разних облика надзора мрежа који угрожавају личну слободу и приватност, поверљиве пословне активности и личне односе и државне безбедности познате као анализа саобраћаја.</string>
-    <string name="status_starting_up">Орбот се покреће...</string>
-  <string name="status_activated">Повезан са Тор мрежом</string>
-  <string name="status_disabled">Орбот је деактивиран</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Није могуће покренути Тор процес:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Ваше ReachableAddresses поставке су изазвале изузетак!</string>
-  <string name="your_relay_settings_caused_an_exception_">Ваше поставке релеја су изазвале изузетак!</string>
-    <string name="found_existing_tor_process">нађен покренути Тор процес...</string>
-  <string name="something_bad_happened">Нешто лоше се догодило. Прегледајте логове</string>
-    <string name="unable_to_read_hidden_service_name">нисам у могућности да прочитам име сакривеног сервиса</string>
-  <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-sv/strings.xml b/orbotmanager/src/main/res/values-sv/strings.xml
deleted file mode 100644
index e0a93631..00000000
--- a/orbotmanager/src/main/res/values-sv/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot är en gratis proxyapp som möjliggör andra appar att använda internet mer säkert. Orbot använder Tor för att kryptera din internettrafik och döljer den genom att den studsar genom ett antal datorer världen över. Tor är fri programvara och ett öppet nätverk som hjälper dig att skydda dig mot en form av nätverksövervakning som hotar personlig integritet och frihet, hemliga affärsaktiviteter och relationer, och skyddar mot statlig övervakning även kallad trafikanalys.</string>
-    <string name="status_starting_up">Orbot startar...</string>
-  <string name="status_activated">Uppkopplad till Tor nätverket</string>
-  <string name="status_disabled">Orbot är inaktiverad</string>
-  <string name="status_shutting_down">TorService avslutas</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Din NåbaraAdresser inställning orsakade ett undantag!</string>
-  <string name="your_relay_settings_caused_an_exception_">Din relä inställning orsakade ett undantag!</string>
-    <string name="found_existing_tor_process">hittade existerande Tor process...</string>
-  <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string>
-    <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
-  <string name="unable_to_start_tor">Kan inte starta Tor:</string>
-    <string name="newnym">Du har bytt till en ny Tor identitet!</string>
-    <string name="updating_settings_in_tor_service">uppdaterar inställningar i Tor-tjänsten</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-ta/strings.xml b/orbotmanager/src/main/res/values-ta/strings.xml
deleted file mode 100644
index 0351d9da..00000000
--- a/orbotmanager/src/main/res/values-ta/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">ஆர்பாட் </string>
-  <string name="app_description">ஆர்பாட், இன்னும பாதுகாப்பான முறையில் இணைய பயன்படுத்த மற்ற பயன்பாடுகள் பலப்படுத்துகிறார் என்று ஒரு இலவச ப்ராக்ஸி பயன்பாடு ஆகும். ஆர்பாட் உங்கள் இணைய போக்குவரத்து குறியாக்க தோர் பயன்படுத்துகிறது மற்றும் அதன் பின்னர் உலகம் முழுவதும் கணினிகள் ஒரு தொடர் மூலம் எதிர்க்கிறது அதை மறுத்தவர். தோர் இலவச மென்பொருள் மற்றும் நீங்கள் போக்குவரத்து பகுப்பாய்வு என்ற தனிப்பட்ட சுதந்திரம் மற்றும் தனியுரிமை, ரகசிய வணிக நடவடிக்கைகள் மற்றும் உறவுகள், மற்றும் மாநில பாதுகாப்பை அச்சுறுத்தும் நெட்வொர்க் கண்காணிப்பு வடிவ எதிராக பாதுகாக்க உதவுகிறது என்று ஒரு திறந்த நெட்வொர்க் ஆகும்.</string>
-    <string name="status_starting_up">ஆர்பாட் துவங்குகிறது...</string>
-  <string name="status_activated">தோர் நெட்வொர்க் இணைக்கப்பட்ட</string>
-  <string name="status_disabled">ஆர்பாட் நிறுத்தப்பட்டது</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-th/strings.xml b/orbotmanager/src/main/res/values-th/strings.xml
deleted file mode 100644
index 00c8b4a2..00000000
--- a/orbotmanager/src/main/res/values-th/strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_activated">เชื่อมต่อกับเครือข่าย Tor</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">ไม่สามารถเริ่มโพรเซสของ Tor</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">การตั้งค่า ReachableAddresses ของคุณทำให้เกิดข้อผิดพลาด</string>
-  <string name="your_relay_settings_caused_an_exception_">การตั้งค่ารีเลย์ของคุณทำให้เกิดข้อผิดพลาด</string>
-    <string name="something_bad_happened">เกิดอะไรไม่ดีสักอย่าง ให้ตรวจดูจากปูม</string>
-    <string name="unable_to_read_hidden_service_name">ไม่สามารถอ่านชื่อของบริการไม่เปิดเผย</string>
-  <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-tl/strings.xml b/orbotmanager/src/main/res/values-tl/strings.xml
deleted file mode 100644
index cdc446fc..00000000
--- a/orbotmanager/src/main/res/values-tl/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Nagsisimula na ang Orbot…</string>
-  <string name="status_activated">Konektado sa Tor network</string>
-  <string name="status_disabled">Naka-deactivate ang Orbot</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Hindi ma umpisahan ang proseso ng Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Ang iyong ReachableAddresses settings ay nag sanhi ng exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Ang iyong relay settings ay nag sanhi ng exception!</string>
-    <string name="found_existing_tor_process"> nakakita ng umiiral na Tor process...</string>
-  <string name="something_bad_happened">May nangyaring masama. Tingnan ang log</string>
-    <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
-  <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
-    <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-tr/strings.xml b/orbotmanager/src/main/res/values-tr/strings.xml
deleted file mode 100644
index 8fdc1085..00000000
--- a/orbotmanager/src/main/res/values-tr/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot başka uygulamaların interneti daha güvenli olarak kullanmasını sağlayan ücretsiz bir proxy uygulamasıdır. Orbot Tor\'u kullanarak internet trafiğinizi şifreler ve dünya üzerindeki pek çok farklı bilgisayardan geçirerek gizler. Tor sizin kişisel özgürlüğünüzü ve mahremiyetinizi, gizli ticari aktivitelerinizi ve bağlantılarınızı koruma altına alan bir yazılım ve açık ağdır.</string>
-    <string name="status_starting_up">Orbot başlatılıyor...</string>
-  <string name="status_activated">Tor ağına bağlandı</string>
-  <string name="status_disabled">Orbot devre dışı bırakıldı</string>
-  <string name="status_shutting_down">Tor hizmeti kapatılıyor</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Tor işlemi başlatılamadı</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">ErişilebilirAdresleriniz ayarlarınız bir istisnaya yol açtı!</string>
-  <string name="your_relay_settings_caused_an_exception_">Tor aktarıcı ayarlarınız bir istisnaya yol açtı!</string>
-    <string name="found_existing_tor_process">varolan bir Tor işlemi bulundu...</string>
-  <string name="something_bad_happened">Kötü bir şey oldu. Kayıtlara bakınız</string>
-    <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamıyor</string>
-  <string name="unable_to_start_tor">Tor başlatılamadı:</string>
-    <string name="newnym">Yeni bir Tor kimliğine geçiş yaptınız!</string>
-    <string name="updating_settings_in_tor_service">Tor hizmet ayarları güncellemesi</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-uk/strings.xml b/orbotmanager/src/main/res/values-uk/strings.xml
deleted file mode 100644
index da62e234..00000000
--- a/orbotmanager/src/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot — це вільна програма для проксі-з\'єднань, яка дозволяє іншим додаткам безпечніше використовувати інтернет-з\'єднання. Orbot використовує Tor для шифрування інтернет-трафіку, який далі приховується під час пересилання через кілька комп\'ютерів у різних частинах планети. Tor є вільним програмним забезпеченням, а також відкритою мережею, що допомагає захиститися від мережевого стеження, яке загрожує особистій свободі та приватному життю, конфіденційній бізнес-діяльності і контактам, а також державної програми безпеки, що відома як аналіз трафіку.</string>
-    <string name="status_starting_up">Запуск Orbot...</string>
-  <string name="status_activated">Під\'єднаний до мережі Tor</string>
-  <string name="status_disabled">«Orbot» від\'єднаний</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Неможливо запустити Tor: </string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Ваші налаштування Доступних Адрес викликали виключення!</string>
-  <string name="your_relay_settings_caused_an_exception_">Налаштування вашого ретранслятора викликали виключення!</string>
-    <string name="found_existing_tor_process">знайдено існуючий процес Tor...</string>
-  <string name="something_bad_happened">Виникла якась помилка. Перевірте лог</string>
-    <string name="unable_to_read_hidden_service_name">неможливо прочитати ім\'я прихованої служби</string>
-  <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
-    <string name="newnym">Ви перемкнулись на новий ідентифікатор Tor!</string>
-    <string name="updating_settings_in_tor_service">оновлення налаштувань у сервісі Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-ur/strings.xml b/orbotmanager/src/main/res/values-ur/strings.xml
deleted file mode 100644
index 05e2b960..00000000
--- a/orbotmanager/src/main/res/values-ur/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Welcome Wizard strings (DJH)-->
-  <!--END Welcome Wizard strings (DJH)-->
-  <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-</resources>
diff --git a/orbotmanager/src/main/res/values-uz/strings.xml b/orbotmanager/src/main/res/values-uz/strings.xml
deleted file mode 100644
index 639c0fd3..00000000
--- a/orbotmanager/src/main/res/values-uz/strings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-    <string name="status_starting_up">Orbot ishga tushirilmoqda…</string>
-  <string name="status_activated">Tor tarmog\'iga ulangan</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-  <!--Permissions screen-->
-  <!--TipsAndTricks screen-->
-  <!--Transparent Proxy screen-->
-    <string name="found_existing_tor_process">Mavjud bo\'lgan Tor jarayoni topildi...</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-vi/strings.xml b/orbotmanager/src/main/res/values-vi/strings.xml
deleted file mode 100644
index e5b39dff..00000000
--- a/orbotmanager/src/main/res/values-vi/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot là một ứng dụng proxy miễn phí, được thiết kế để làm cho các ứng dụng khác kết nối với Internet một cách an toàn. Orbot sử dụng Tor để mã hóa các kết nối Internet rồi ẩn danh nó thông qua một loạt các nút trong mạng Tor. Tor là phần mềm miễn phí và là một mạng lưới mở giúp bạn chống lại sự giám sát mạng, vốn đe dọa riêng tư trực tuyến, hay các hoạt động bí mật...</string>
-    <string name="status_starting_up">Ortbot đang khởi động...</string>
-  <string name="status_activated">Đã kết nối với mạng Tor</string>
-  <string name="status_disabled">Orbot đã được vô hiệu hóa</string>
-  <string name="status_shutting_down">Đang tắt dịch vụ Tor</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">Không thể khởi động tiến trình Tor:</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">Thiết lập ReachableAddresses đã gây ra một vấn đề! </string>
-  <string name="your_relay_settings_caused_an_exception_">Thiết lập relay của bạn đã gây ra một vấn đề!</string>
-    <string name="found_existing_tor_process">tìm ra tiến trình hiện hành của Tor...</string>
-  <string name="something_bad_happened">Có gì đó không ổn. Xin xem lại nhật ký</string>
-    <string name="unable_to_read_hidden_service_name">không thể đọc được tên dịch vụ ẩn</string>
-  <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
-    <string name="newnym">Bạn đã chuyển sang một mạch Tor mới!</string>
-    <string name="updating_settings_in_tor_service">đang cập nhật cài đặt dịch vụ Tor</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-zh-rCN/strings.xml b/orbotmanager/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 888444a0..00000000
--- a/orbotmanager/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot 是一款免费的代理应用，能够让其他应用更安全地使用互联网。通过在位于世界各地的一系列计算机之间进行跳转，Orbot 可利用 Tor 对网络通信进行加密并隐藏。Tor 是一款免费的软件，并且是一个开放的网络。它可以保护用户免受流量分析的危害，这种网络监控可对个人自由与隐私、商业机密活动和关系以及国家安全造成威胁。</string>
-    <string name="status_starting_up">Orbot 正在启动...</string>
-  <string name="status_activated">已连接到 Tor 网络</string>
-  <string name="status_disabled">Orbot 已停用</string>
-  <string name="status_shutting_down">Tor服务 正在关闭</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-    <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-    <string name="couldn_t_start_tor_process_">无法启动 Tor 进程：</string>
-    <string name="your_reachableaddresses_settings_caused_an_exception_">可访问地址设置导致异常！</string>
-  <string name="your_relay_settings_caused_an_exception_">中继设置导致异常！</string>
-    <string name="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
-  <string name="something_bad_happened">发生错误，请检查日志</string>
-    <string name="unable_to_read_hidden_service_name">无法读取隐藏服务名称</string>
-  <string name="unable_to_start_tor">无法启动 Tor：</string>
-    <string name="newnym">已切换为新的 Tor 标识！</string>
-    <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string>
-</resources>
diff --git a/orbotmanager/src/main/res/values-zh-rTW/strings.xml b/orbotmanager/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 41fc8821..00000000
--- a/orbotmanager/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="app_description">Orbot是一款免費的網絡代理應用程式，用來保護其他應用程式的上網安全。
-Orbot使用Tor在全球一系列的電腦間跳躍，以便隱藏網路流量並加密。Tor是個免費軟體也是個開放網路，能幫您抵禦流量分析。它是某一種網路監控，牽涉到個人的自由與隱私、商業部分的機密關係和活動、甚至國家安全。</string>
-    <string name="status_starting_up">Orbot 正在啟動中...</string>
-  <string name="status_activated">已連線至 Tor 網路</string>
-  <string name="status_disabled">Orbot 已停用</string>
-  <string name="status_shutting_down">Tor服務 正在關閉</string>
-    <!--Welcome Wizard strings (DJH)-->
-    <!--END Welcome Wizard strings (DJH)-->
-    <!--New Wizard Strings-->
-  <!--Title Screen-->
-  <!--Warning screen-->
-    <!--Permissions screen-->
-    <!--TipsAndTricks screen-->
-    <!--Transparent Proxy screen-->
-</resources>