diff --git a/buildSrc/src/main/kotlin/ComponentVersions.kt b/buildSrc/src/main/kotlin/ComponentVersions.kt
index 6920f7f6..fafb0857 100644
--- a/buildSrc/src/main/kotlin/ComponentVersions.kt
+++ b/buildSrc/src/main/kotlin/ComponentVersions.kt
@@ -1,6 +1,6 @@
 object ComponentVersions {
 
-    const val toolbarVersion = "2.0.7"
+    const val toolbarVersion = "2.0.8"
     const val suggestionInputViewVersion = "1.3.0"
     const val ratingBarVersion = "1.0.2"
     const val imageSliderVersion = "1.0.8"
diff --git a/libraries/card-input-view/README.md b/libraries/card-input-view/README.md
index 378ed6ee..2058f8e4 100644
--- a/libraries/card-input-view/README.md
+++ b/libraries/card-input-view/README.md
@@ -1,7 +1,7 @@
 
 <img src="https://raw.githubusercontent.com/Trendyol/android-ui-components/master/images/card-input-view-1.png" width="240"/> <img src="https://raw.githubusercontent.com/Trendyol/android-ui-components/master/images/card-input-view-2.png" width="240"/>
   
-$cardInputViewVersion = card-input-view-1.2.1 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+$cardInputViewVersion = card-input-view-1.2.2 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
   
 ## CardInputView  
 CardInputView is custom view for Master or Visa debit/credit card inputs. It can verify card number, expire date and CVV for you.
diff --git a/libraries/toolbar/README.md b/libraries/toolbar/README.md
index fb73d3c7..ffd9f03f 100644
--- a/libraries/toolbar/README.md
+++ b/libraries/toolbar/README.md
@@ -1,6 +1,6 @@
 <img src="https://raw.githubusercontent.com/Trendyol/android-ui-components/master/images/toolbar-1.png" width="240"/>
 
-$toolbarVersion = toolbar-2.0.6  [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+$toolbarVersion = toolbar-2.0.8  [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 ## Toolbar
 Toolbar is alternative implementation of Toolbar component on Android.
diff --git a/libraries/toolbar/src/main/java/com/trendyol/uicomponents/toolbar/Toolbar.kt b/libraries/toolbar/src/main/java/com/trendyol/uicomponents/toolbar/Toolbar.kt
index 9af0144b..93ac9414 100644
--- a/libraries/toolbar/src/main/java/com/trendyol/uicomponents/toolbar/Toolbar.kt
+++ b/libraries/toolbar/src/main/java/com/trendyol/uicomponents/toolbar/Toolbar.kt
@@ -52,14 +52,14 @@ class Toolbar : ConstraintLayout {
     init {
         inflate(context, R.layout.view_toolbar, this)
 
-        imageLeft.setDebouncedOnClickListener { leftImageClickListener?.invoke() }
-        imageMiddle.setDebouncedOnClickListener { middleImageClickListener?.invoke() }
+        imageLeft.setOnClickListener { leftImageClickListener?.invoke() }
+        imageMiddle.setOnClickListener { middleImageClickListener?.invoke() }
         imageRight.setDebouncedOnClickListener { rightImageClickListener?.invoke() }
-        textLeftUp.setDebouncedOnClickListener { upperLeftTextClickListener?.invoke() }
-        textLeftDown.setDebouncedOnClickListener { lowerLeftTextClickListener?.invoke() }
-        textMiddle.setDebouncedOnClickListener { middleTextClickListener?.invoke() }
-        textRightUp.setDebouncedOnClickListener { upperRightTextClickListener?.invoke() }
-        textRightDown.setDebouncedOnClickListener { lowerRightTextClickListener?.invoke() }
+        textLeftUp.setOnClickListener { upperLeftTextClickListener?.invoke() }
+        textLeftDown.setOnClickListener { lowerLeftTextClickListener?.invoke() }
+        textMiddle.setOnClickListener { middleTextClickListener?.invoke() }
+        textRightUp.setOnClickListener { upperRightTextClickListener?.invoke() }
+        textRightDown.setOnClickListener { lowerRightTextClickListener?.invoke() }
     }
 
     private fun readFromAttributes(attrs: AttributeSet?, defStyleAttr: Int = 0) {