diff --git a/android-app/app/build.gradle b/android-app/app/build.gradle
index d567cc63..3865a6d3 100644
--- a/android-app/app/build.gradle
+++ b/android-app/app/build.gradle
@@ -53,8 +53,8 @@ android {
         applicationId "arun.com.chromer"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 54
-        versionName "2.1.1"
+        versionCode 55
+        versionName "2.1.2"
 
         multiDexEnabled true
 
diff --git a/android-app/app/src/main/java/arun/com/chromer/home/epoxycontroller/model/TabModel.kt b/android-app/app/src/main/java/arun/com/chromer/home/epoxycontroller/model/TabModel.kt
index 94be98bf..dea1fa30 100644
--- a/android-app/app/src/main/java/arun/com/chromer/home/epoxycontroller/model/TabModel.kt
+++ b/android-app/app/src/main/java/arun/com/chromer/home/epoxycontroller/model/TabModel.kt
@@ -5,6 +5,7 @@ import arun.com.chromer.data.website.model.Website
 import arun.com.chromer.tabs.TabsManager
 import arun.com.chromer.util.glide.GlideApp
 import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyAttribute.Option.DoNotHash
 import com.airbnb.epoxy.EpoxyModelClass
 import dev.arunkumar.android.epoxy.model.KotlinEpoxyModelWithHolder
 import dev.arunkumar.android.epoxy.model.KotlinHolder
@@ -14,6 +15,8 @@ import kotlinx.android.synthetic.main.widget_tab_model_preview.*
 abstract class TabModel : KotlinEpoxyModelWithHolder<TabModel.ViewHolder>() {
     @EpoxyAttribute
     lateinit var tab: TabsManager.Tab
+    @EpoxyAttribute(DoNotHash)
+    lateinit var tabsManager: TabsManager
 
     override fun bind(holder: ViewHolder) {
         super.bind(holder)
@@ -21,6 +24,13 @@ abstract class TabModel : KotlinEpoxyModelWithHolder<TabModel.ViewHolder>() {
                 .load(tab.website ?: Website(tab.url))
                 .circleCrop()
                 .into(holder.icon)
+        holder.containerView.setOnClickListener {
+            tabsManager.reOrderTabByUrl(
+                    holder.containerView.context,
+                    Website(tab.url),
+                    listOf(tab.getTargetActivityName())
+            )
+        }
     }
 
     class ViewHolder : KotlinHolder()
diff --git a/android-app/app/src/main/java/arun/com/chromer/home/epoxycontroller/model/TabsInfoModel.kt b/android-app/app/src/main/java/arun/com/chromer/home/epoxycontroller/model/TabsInfoModel.kt
index fe6caee2..b18133c8 100644
--- a/android-app/app/src/main/java/arun/com/chromer/home/epoxycontroller/model/TabsInfoModel.kt
+++ b/android-app/app/src/main/java/arun/com/chromer/home/epoxycontroller/model/TabsInfoModel.kt
@@ -1,5 +1,6 @@
 package arun.com.chromer.home.epoxycontroller.model
 
+import android.view.View
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -21,8 +22,6 @@ abstract class TabsInfoModel : KotlinEpoxyModelWithHolder<TabsInfoModel.ViewHold
     @EpoxyAttribute(DoNotHash)
     lateinit var tabsManager: TabsManager
 
-    private var init = false
-
     override fun bind(holder: ViewHolder) {
         super.bind(holder)
         holder.tabsDescription.text = holder.tabsDescription.context.resources.getQuantityString(
@@ -30,20 +29,9 @@ abstract class TabsInfoModel : KotlinEpoxyModelWithHolder<TabsInfoModel.ViewHold
                 tabs.size,
                 tabs.size
         )
-        holder.containerView.setOnClickListener {
+        holder.tabsCard.setOnClickListener {
             tabsManager.showTabsActivity()
         }
-        if (!init) {
-            holder.tabsPreviewRecyclerView.apply {
-                (itemAnimator as? DefaultItemAnimator)?.supportsChangeAnimations = false
-                layoutManager = LinearLayoutManager(
-                        holder.containerView.context,
-                        RecyclerView.HORIZONTAL,
-                        false
-                )
-            }
-            init = true
-        }
         if (tabs.isEmpty()) {
             holder.tabsPreviewRecyclerView.gone()
         } else {
@@ -53,11 +41,24 @@ abstract class TabsInfoModel : KotlinEpoxyModelWithHolder<TabsInfoModel.ViewHold
                     tab {
                         id(tab.hashCode())
                         tab(tab)
+                        tabsManager(tabsManager)
                     }
                 }
             }
         }
     }
 
-    class ViewHolder : KotlinHolder()
+    class ViewHolder : KotlinHolder() {
+        override fun bindView(itemView: View) {
+            super.bindView(itemView)
+            tabsPreviewRecyclerView.apply {
+                (itemAnimator as? DefaultItemAnimator)?.supportsChangeAnimations = false
+                layoutManager = LinearLayoutManager(
+                        containerView.context,
+                        RecyclerView.HORIZONTAL,
+                        false
+                )
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/android-app/app/src/main/java/arun/com/chromer/util/glide/favicon/WebsiteDecoder.kt b/android-app/app/src/main/java/arun/com/chromer/util/glide/favicon/WebsiteDecoder.kt
index ce5f8a87..2f8535fb 100644
--- a/android-app/app/src/main/java/arun/com/chromer/util/glide/favicon/WebsiteDecoder.kt
+++ b/android-app/app/src/main/java/arun/com/chromer/util/glide/favicon/WebsiteDecoder.kt
@@ -49,8 +49,7 @@ class WebsiteDecoder(private val context: Context, glide: Glide) : ResourceDecod
             Color.parseColor("#EC4E20"),
             Color.parseColor("#6EEB83"),
             Color.parseColor("#29335C"),
-            Color.parseColor("#BDE4A8"),
-            Color.parseColor("#A491D3")
+            Color.parseColor("#BDE4A8")
     )
 
     override fun handles(source: Website, options: Options): Boolean = true
diff --git a/android-app/app/src/main/res/layout/layout_tabs_info_card.xml b/android-app/app/src/main/res/layout/layout_tabs_info_card.xml
index 1dad9a88..322d04fb 100644
--- a/android-app/app/src/main/res/layout/layout_tabs_info_card.xml
+++ b/android-app/app/src/main/res/layout/layout_tabs_info_card.xml
@@ -2,13 +2,12 @@
 <androidx.cardview.widget.CardView 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:id="@+id/tabsCard"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginLeft="8dp"
     android:layout_marginTop="4dp"
     android:layout_marginRight="8dp"
-    android:clickable="true"
-    android:focusable="true"
     app:cardPreventCornerOverlap="true"
     app:cardUseCompatPadding="true">
 
@@ -44,7 +43,7 @@
             android:gravity="center|start"
             android:textColor="@color/primary_text_color"
             app:layout_constraintBottom_toTopOf="@+id/tabsPreviewRecyclerView"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/tabsButton"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/tabsIcon"
             app:layout_constraintTop_toTopOf="parent"
@@ -61,13 +60,26 @@
             android:foregroundGravity="left"
             android:orientation="horizontal"
             android:visibility="gone"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/tabsButton"
             app:layout_constraintStart_toEndOf="@+id/tabsIcon"
             app:layout_constraintTop_toBottomOf="@+id/tabsDescription"
             tools:itemCount="8"
-            tools:listitem="@layout/widget_tab_model_preview" />
+            tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/widget_tab_model_preview"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/tabsButton"
+            style="@style/FeedBorderlessButton"
+            android:layout_height="0dp"
+            android:paddingStart="8dp"
+            android:paddingLeft="8dp"
+            android:text="@string/title_tabs"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/android-app/app/src/main/res/values/changelog.xml b/android-app/app/src/main/res/values/changelog.xml
index 93e29a7e..07ee88f1 100644
--- a/android-app/app/src/main/res/values/changelog.xml
+++ b/android-app/app/src/main/res/values/changelog.xml
@@ -36,6 +36,10 @@ a {
 <body>
 <strong>You can view this again in the About screen.</strong>
 <br></br>
+<strong>2.1.2</strong>
+<ul>
+    <li><b>FIX: </b> Clear text communication error.</li>
+</ul>
 <strong>2.1.1</strong>
 <ul>
     <li><b>FIX: </b> Open/Search with Lynket option not using selected search engine</li>
diff --git a/android-app/app/src/main/res/values/styles.xml b/android-app/app/src/main/res/values/styles.xml
index bb84dfb9..9c520d06 100644
--- a/android-app/app/src/main/res/values/styles.xml
+++ b/android-app/app/src/main/res/values/styles.xml
@@ -138,8 +138,8 @@
     <style name="FeedBorderlessButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginEnd">16dp</item>
-        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
         <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:gravity">center</item>
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Button</item>
diff --git a/android-app/app/src/main/res/xml/network_security_config.xml b/android-app/app/src/main/res/xml/network_security_config.xml
index bdb181c3..ab2c078d 100644
--- a/android-app/app/src/main/res/xml/network_security_config.xml
+++ b/android-app/app/src/main/res/xml/network_security_config.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
+<network-security-config xmlns:tools="http://schemas.android.com/tools">
+    <base-config
+        cleartextTrafficPermitted="true"
+        tools:ignore="InsecureBaseConfiguration" />
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">suggestqueries.google.com</domain>
     </domain-config>