Minor UI tweaks to smoothen icons

- Greyed out icons for security UI
- Settings UI layout modifications
- Search popup menu theming
- Edge navigation setting panel opacity

Change-Id: Ie45b73399cf46f561ecf5801f969e63d8b1bba72
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 88d0e32..d704526 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -46,16 +46,16 @@
         <SwitchPreference
             android:layout="@layout/swe_preference"
             android:defaultValue="false"
-            android:key="powersave_enabled"
-            android:summary="@string/pref_powersave_enabled_summary"
-            android:title="@string/pref_powersave_enabled" />
+            android:key="nightmode_enabled"
+            android:summary="@string/pref_nightmode_enabled_summary"
+            android:title="@string/pref_nightmode_enabled" />
 
         <SwitchPreference
             android:layout="@layout/swe_preference"
             android:defaultValue="false"
-            android:key="nightmode_enabled"
-            android:summary="@string/pref_nightmode_enabled_summary"
-            android:title="@string/pref_nightmode_enabled" />
+            android:key="powersave_enabled"
+            android:summary="@string/pref_powersave_enabled_summary"
+            android:title="@string/pref_powersave_enabled" />
 
         <com.android.browser.mdm.MdmCheckBoxPreference
             android:layout="@layout/swe_preference"