diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryAdapter.kt
index 79d6e80a5..82e04932f 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryAdapter.kt
@@ -62,6 +62,8 @@ private class HistoryList(val history: List<HistoryItem>) {
         items.addAll(groups.adapterItemsForRange(Range.ThisWeek))
         items.addAll(groups.adapterItemsForRange(Range.ThisMonth))
         items.addAll(groups.adapterItemsForRange(Range.Older))
+        // No history only the delete button, so let's clear the list to show the empty text
+        if (items.size == 1) items.clear()
         this.items = items
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt
index 19e2d3aa3..6afdfa272 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt
@@ -7,17 +7,20 @@ package org.mozilla.fenix.library.history
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import androidx.appcompat.widget.Toolbar
 import android.widget.ImageButton
-import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.reactivex.Observable
 import io.reactivex.Observer
 import io.reactivex.functions.Consumer
+import kotlinx.android.synthetic.main.component_history.*
 import kotlinx.android.synthetic.main.component_history.view.*
+import kotlinx.android.synthetic.main.delete_history_button.*
 import mozilla.components.support.base.feature.BackHandler
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.asActivity
@@ -42,7 +45,7 @@ class HistoryUIView(
 
     fun getSelected(): List<HistoryItem> = historyAdapter.selected
 
-    override val view: LinearLayout = LayoutInflater.from(container.context)
+    override val view: FrameLayout = LayoutInflater.from(container.context)
         .inflate(R.layout.component_history, container, true)
         .findViewById(R.id.history_wrapper)
 
@@ -63,7 +66,7 @@ class HistoryUIView(
 
         items = it.items
         when (val modeCopy = mode) {
-            is HistoryState.Mode.Normal -> setUIForNormalMode()
+            is HistoryState.Mode.Normal -> setUIForNormalMode(items.isEmpty())
             is HistoryState.Mode.Editing -> setUIForSelectingMode(modeCopy)
         }
     }
@@ -79,8 +82,10 @@ class HistoryUIView(
         )
     }
 
-    private fun setUIForNormalMode() {
+    private fun setUIForNormalMode(isEmpty: Boolean) {
         (activity as? AppCompatActivity)?.title = context.getString(R.string.library_history)
+        delete_history_button?.visibility = if (isEmpty) View.GONE else View.VISIBLE
+        history_empty_view.visibility = if (isEmpty) View.VISIBLE else View.GONE
         setToolbarColors(
             R.attr.primaryText.getColorIntFromAttr(context!!),
             R.attr.foundation.getColorIntFromAttr(context)
@@ -127,7 +132,7 @@ class HistoryUIView(
             mode is HistoryState.Mode.Editing -> {
                 mode = HistoryState.Mode.Normal
                 historyAdapter.updateData(items, mode)
-                setUIForNormalMode()
+                setUIForNormalMode(items.isEmpty())
                 actionEmitter.onNext(HistoryAction.SwitchMode)
                 true
             }
diff --git a/app/src/main/res/layout/component_bookmark.xml b/app/src/main/res/layout/component_bookmark.xml
index 218624e7b..291fdb42d 100644
--- a/app/src/main/res/layout/component_bookmark.xml
+++ b/app/src/main/res/layout/component_bookmark.xml
@@ -22,7 +22,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="@string/bookmarks_empty_message"
-        android:visibility="gone"
-        android:textColor="?primaryText"/>
+        android:textColor="?secondaryText"
+        android:textSize="16sp"
+        android:visibility="gone" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/component_history.xml b/app/src/main/res/layout/component_history.xml
index 0e643b77d..9afb2912e 100644
--- a/app/src/main/res/layout/component_history.xml
+++ b/app/src/main/res/layout/component_history.xml
@@ -3,14 +3,23 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/history_wrapper"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/history_empty_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/history_empty_message"
+        android:textColor="?secondaryText"
+        android:textSize="16sp"
+        android:visibility="gone" />
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/history_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de330cdda..f70ea9018 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -315,6 +315,8 @@
     <string name="history_this_month">This month</string>
     <!-- Text for the header that groups the history older than the last month -->
     <string name="history_older">Older</string>
+    <!-- Text shown when no history exists -->
+    <string name="history_empty_message">No history here</string>
 
     <!-- Crashes -->
     <!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: Fenix) -->