diff --git a/balloon/src/main/java/com/skydoves/balloon/extensions/ImageViewExtension.kt b/balloon/src/main/java/com/skydoves/balloon/extensions/ImageViewExtension.kt
deleted file mode 100644
index 4249cc5c..00000000
--- a/balloon/src/main/java/com/skydoves/balloon/extensions/ImageViewExtension.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2019 skydoves
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.skydoves.balloon.extensions
-
-import com.skydoves.balloon.IconForm
-import com.skydoves.balloon.IconGravity
-import com.skydoves.balloon.vectortext.VectorTextView
-import com.skydoves.balloon.vectortext.VectorTextViewParams
-
-/** applies icon form attributes to a ImageView instance. */
-internal fun VectorTextView.applyIconForm(iconForm: IconForm) {
-  iconForm.drawable?.let {
-    drawableTextViewParams = VectorTextViewParams(
-      iconSize = iconForm.iconSize,
-      compoundDrawablePadding = iconForm.iconSpace,
-      tintColorRes = iconForm.iconColor
-    ).apply {
-      when (iconForm.iconGravity) {
-        IconGravity.LEFT -> {
-          drawableLeft = iconForm.drawable
-          drawableLeftRes = iconForm.drawableRes
-        }
-        IconGravity.TOP -> {
-          drawableTop = iconForm.drawable
-          drawableTopRes = iconForm.drawableRes
-        }
-        IconGravity.BOTTOM -> {
-          drawableBottom = iconForm.drawable
-          drawableBottomRes = iconForm.drawableRes
-        }
-        IconGravity.RIGHT -> {
-          drawableRight = iconForm.drawable
-          drawableRightRes = iconForm.drawableRes
-        }
-      }
-    }
-  }
-}
diff --git a/balloon/src/main/java/com/skydoves/balloon/extensions/TextViewExtension.kt b/balloon/src/main/java/com/skydoves/balloon/extensions/TextViewExtension.kt
index 7f43f2cc..3b4a885e 100644
--- a/balloon/src/main/java/com/skydoves/balloon/extensions/TextViewExtension.kt
+++ b/balloon/src/main/java/com/skydoves/balloon/extensions/TextViewExtension.kt
@@ -22,7 +22,11 @@ import android.text.Html
 import android.text.Spanned
 import android.widget.TextView
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.text.HtmlCompat
+import com.skydoves.balloon.IconForm
+import com.skydoves.balloon.IconGravity
 import com.skydoves.balloon.TextForm
+import com.skydoves.balloon.vectortext.VectorTextView
 import com.skydoves.balloon.vectortext.VectorTextViewParams
 
 /** applies text form attributes to a TextView instance. */
@@ -43,7 +47,37 @@ private fun fromHtml(text: String): Spanned? {
   return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
     Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY)
   } else {
-    Html.fromHtml(text)
+    HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY)
+  }
+}
+
+/** applies icon form attributes to a ImageView instance. */
+internal fun VectorTextView.applyIconForm(iconForm: IconForm) {
+  iconForm.drawable?.let {
+    drawableTextViewParams = VectorTextViewParams(
+      iconSize = iconForm.iconSize,
+      compoundDrawablePadding = iconForm.iconSpace,
+      tintColorRes = iconForm.iconColor
+    ).apply {
+      when (iconForm.iconGravity) {
+        IconGravity.LEFT -> {
+          drawableLeft = iconForm.drawable
+          drawableLeftRes = iconForm.drawableRes
+        }
+        IconGravity.TOP -> {
+          drawableTop = iconForm.drawable
+          drawableTopRes = iconForm.drawableRes
+        }
+        IconGravity.BOTTOM -> {
+          drawableBottom = iconForm.drawable
+          drawableBottomRes = iconForm.drawableRes
+        }
+        IconGravity.RIGHT -> {
+          drawableRight = iconForm.drawable
+          drawableRightRes = iconForm.drawableRes
+        }
+      }
+    }
   }
 }