diff --git a/app/src/main/java/com/github/libretube/Home.kt b/app/src/main/java/com/github/libretube/Home.kt
index 9c78c562a..aeea5434f 100644
--- a/app/src/main/java/com/github/libretube/Home.kt
+++ b/app/src/main/java/com/github/libretube/Home.kt
@@ -9,6 +9,7 @@ import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -40,6 +41,11 @@ class Home : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        val searchButton = view.findViewById<com.google.android.material.floatingactionbutton
+            .FloatingActionButton>(R.id.search_fab)
+        searchButton.setOnClickListener {
+            findNavController().navigate(R.id.searchFragment)
+        }
         val recyclerView = view.findViewById<RecyclerView>(R.id.recview)
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
         val grid = sharedPreferences.getString(
diff --git a/app/src/main/res/drawable/ic_arrow_down2.xml b/app/src/main/res/drawable/ic_arrow_down2.xml
deleted file mode 100644
index e8123164a..000000000
--- a/app/src/main/res/drawable/ic_arrow_down2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector android:height="24dp"
-    android:tint="#FFFFFF"
-    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="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_close2.xml b/app/src/main/res/drawable/ic_close2.xml
deleted file mode 100644
index 3d79675c2..000000000
--- a/app/src/main/res/drawable/ic_close2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wifi_off.xml b/app/src/main/res/drawable/ic_no_wifi.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_wifi_off.xml
rename to app/src/main/res/drawable/ic_no_wifi.xml
diff --git a/app/src/main/res/drawable/ic_search2.xml b/app/src/main/res/drawable/ic_search2.xml
deleted file mode 100644
index 5188b2a93..000000000
--- a/app/src/main/res/drawable/ic_search2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="35dp"
-    android:height="35dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_nointernet.xml b/app/src/main/res/layout/activity_nointernet.xml
index 9303bc516..69874d73e 100644
--- a/app/src/main/res/layout/activity_nointernet.xml
+++ b/app/src/main/res/layout/activity_nointernet.xml
@@ -22,7 +22,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_wifi_off" />
+        app:srcCompat="@drawable/ic_no_wifi" />
 
     <TextView
         android:id="@+id/noInternet_textView"
diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml
index 2c534bc78..c599431f2 100644
--- a/app/src/main/res/layout/exo_styled_player_control_view.xml
+++ b/app/src/main/res/layout/exo_styled_player_control_view.xml
@@ -12,7 +12,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- 0dp dimensions are used to prevent this view from influencing the size of
          the parent view if it uses "wrap_content". It is expanded to occupy the
@@ -48,9 +49,10 @@
                 android:id="@+id/close_imageButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_close2"
+                android:src="@drawable/ic_close"
                 android:padding="@dimen/exo_icon_padding"
-                android:background="#00FFFFFF" />
+                android:background="#00FFFFFF"
+                app:tint="@color/white" />
         </LinearLayout>
 
         <LinearLayout
@@ -85,9 +87,10 @@
                 android:id="@+id/quality_select"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_arrow_down2"
+                android:src="@drawable/ic_arrow_down"
                 android:padding="@dimen/exo_icon_padding"
-                android:background="#00FFFFFF" />
+                android:background="#00FFFFFF"
+                app:tint="@color/white" />
         </LinearLayout>
 
     </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 09399ae97..aff1dc0dd 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -29,5 +29,18 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/progressBar"
             app:layout_constraintTop_toTopOf="parent" />
+
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/search_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_margin="16dp"
+        app:tint="?android:attr/colorBackground"
+        app:backgroundTint="?attr/colorSecondary"
+        app:srcCompat="@drawable/ic_search" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/searchhistory_row.xml b/app/src/main/res/layout/searchhistory_row.xml
index aac477305..11bcf477e 100644
--- a/app/src/main/res/layout/searchhistory_row.xml
+++ b/app/src/main/res/layout/searchhistory_row.xml
@@ -35,7 +35,7 @@
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
         android:padding="5dp"
-        android:src="@drawable/ic_close2"
+        android:src="@drawable/ic_close"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:shapeAppearanceOverlay="@style/roundedImageViewRounded" />