diff --git a/app/e-ui-sdk.jar b/app/e-ui-sdk.jar
index bef8bbabb85217f62afebd4857c1c9969ffa45f5..e55401fc4a7cf2d30a750a642f60090b2f5822ee 100644
Binary files a/app/e-ui-sdk.jar and b/app/e-ui-sdk.jar differ
diff --git a/app/src/main/java/foundation/e/apps/MainActivity.kt b/app/src/main/java/foundation/e/apps/MainActivity.kt
index be750e240b030b91b731c9f3f5ec6e2fb851153f..769fa800d3a2f670a85727735fbbf9268f0cf017 100644
--- a/app/src/main/java/foundation/e/apps/MainActivity.kt
+++ b/app/src/main/java/foundation/e/apps/MainActivity.kt
@@ -204,7 +204,7 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
                 return true
             }
             R.id.menu_search -> {
-                item?.setIcon(R.drawable.ic_menu_search)
+                item?.setIcon(lineageos.platform.R.drawable.ic_search)
                 showFragment(searchFragment)
                 return true
             }
@@ -214,7 +214,7 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
                 return true
             }
             R.id.menu_settings -> {
-                item?.setIcon(lineageos.platform.R.drawable.ic_camera_settings)
+                item?.setIcon(lineageos.platform.R.drawable.ic_settings)
                 showFragment(SettingsFragment())
                 return true
             }
diff --git a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/search/SearchFragment.kt
index dfadd53bb32b992d7bc54ce71b542209d57597b6..438d36539bee8ad344324a2b06bdffe33c95e0f5 100644
--- a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt
+++ b/app/src/main/java/foundation/e/apps/search/SearchFragment.kt
@@ -28,6 +28,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.*
 import androidx.appcompat.widget.SearchView
+import androidx.core.content.ContextCompat
 import androidx.cursoradapter.widget.CursorAdapter
 import androidx.cursoradapter.widget.SimpleCursorAdapter
 import androidx.fragment.app.Fragment
@@ -43,6 +44,7 @@ import foundation.e.apps.search.viewmodel.SearchViewModel
 import foundation.e.apps.utils.Constants
 import foundation.e.apps.utils.Constants.SUGGESTION_KEY
 
+
 class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.OnSuggestionListener {
     private lateinit var searchViewModel: SearchViewModel
     private var focusView: View? = null
diff --git a/app/src/main/res/drawable/ic_menu_settings.xml b/app/src/main/res/drawable/ic_menu_settings.xml
index 73412d4cd04c7144c28c657a7afcee0eee13d5c4..cf6bb5b1706abf4146c81933a87c619372166827 100644
--- a/app/src/main/res/drawable/ic_menu_settings.xml
+++ b/app/src/main/res/drawable/ic_menu_settings.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="576dp"
-    android:height="512dp"
+    android:width="24dp"
+    android:height="21dp"
     android:viewportWidth="576"
     android:viewportHeight="512">
     <path
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 970c8155eb1535581b5eaa096999ae7702b835b5..966552e026d1f3007209d7582002cec408212a98 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -28,8 +28,7 @@
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
         android:elevation="@dimen/default_elevation"
-        android:padding="@dimen/layout_padding_medium"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:theme="@style/ToolbarTheme"
         app:collapseIcon="@drawable/app_border_neutral"
         app:layout_constraintTop_toTopOf="parent"
         app:popupTheme="@style/AlertDialog.AppCompat.Light">
@@ -38,6 +37,7 @@
             android:id="@+id/search_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:searchIcon="@lineageos.platform:drawable/ic_search"
             app:iconifiedByDefault="false" />
 
     </androidx.appcompat.widget.Toolbar>
diff --git a/app/src/main/res/layout/search_splash_layout.xml b/app/src/main/res/layout/search_splash_layout.xml
index fd5512b07b397c18c874d3fcb4374617203fcc79..cc345ef87123b21448e2fe30ed5e831921ac9ed9 100644
--- a/app/src/main/res/layout/search_splash_layout.xml
+++ b/app/src/main/res/layout/search_splash_layout.xml
@@ -29,7 +29,7 @@
     <ImageView
         android:layout_width="64dp"
         android:layout_height="64dp"
-        android:src="@drawable/ic_menu_search"
+        android:src="@lineageos.platform:drawable/ic_search"
         android:tint="@android:color/darker_gray" />
 
     <TextView
diff --git a/app/src/main/res/menu/activity_main_menu.xml b/app/src/main/res/menu/activity_main_menu.xml
index b7449b4d9ffc548ba1f6616326aab070671d33eb..bd772ba2846dd042317d001195007fec0b8a27ad 100644
--- a/app/src/main/res/menu/activity_main_menu.xml
+++ b/app/src/main/res/menu/activity_main_menu.xml
@@ -33,7 +33,7 @@
 
     <item
         android:id="@+id/menu_search"
-        android:icon="@drawable/ic_menu_search"
+        android:icon="@lineageos.platform:drawable/ic_search"
         android:orderInCategory="1"
         android:title="@string/menu_search" />
 
@@ -45,7 +45,7 @@
 
     <item
         android:id="@+id/menu_settings"
-        android:icon="@lineageos.platform:drawable/ic_camera_settings"
+        android:icon="@lineageos.platform:drawable/ic_settings"
         android:orderInCategory="1"
         android:title="@string/menu_settings" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 95ca94f0992a84aa445b4b58fc8ddd4eaf1c4077..f44e16e57ba9da27029a3874afc310282c0ce908 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -28,6 +28,7 @@
 
     <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
     <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="color_default_gray1">@lineageos.platform:color/color_default_gray1</color>
 
     <color name="colorDivider">#CFD8DC</color>
     <color name="color_category_icon">#78909C</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 177214e5c5080945db1b114637312cf275b63396..d3fa64c711c7d4998af61a09cfad02cb3e978aa0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -74,4 +74,8 @@
         <item name="android:windowBackground">@drawable/splash</item>
     </style>
 
+    <style name="ToolbarTheme" parent="Widget.AppCompat.Toolbar">
+        <item name="colorControlNormal">@lineageos.platform:color/color_default_accent</item>
+    </style>
+
 </resources>