diff --git a/gui/devices/1024x600/res/images/background.jpg b/gui/devices/1024x600/res/images/background.jpg
index 6ff8d4d1..2ac48e0a 100644
Binary files a/gui/devices/1024x600/res/images/background.jpg and b/gui/devices/1024x600/res/images/background.jpg differ
diff --git a/gui/devices/1024x600/res/images/backgroundbottom.jpg b/gui/devices/1024x600/res/images/backgroundbottom.jpg
deleted file mode 100644
index cb48680d..00000000
Binary files a/gui/devices/1024x600/res/images/backgroundbottom.jpg and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/backgroundside.jpg b/gui/devices/1024x600/res/images/backgroundside.jpg
deleted file mode 100644
index 91ede1e1..00000000
Binary files a/gui/devices/1024x600/res/images/backgroundside.jpg and /dev/null differ
diff --git a/gui/devices/1024x600/res/images/large_black.png b/gui/devices/1024x600/res/images/large_black.png
deleted file mode 100644
index f1f4fa10..00000000
Binary files a/gui/devices/1024x600/res/images/large_black.png and /dev/null differ
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index 4835d829..5979c50b 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -12,9 +12,6 @@
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Regular-20" />
 		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="side" type="image" filename="backgroundside.jpg" />
-		<resource name="bottom" type="image" filename="backgroundbottom.jpg" />
-		<resource name="large_black" type="image" filename="large_black" />
 		<resource name="main_button" type="image" filename="button" />
 		<resource name="file_icon" type="image" filename="file" />
 		<resource name="folder_icon" type="image" filename="folder" />
@@ -212,35 +209,15 @@
 		<template name="header">
 			<background color="#000000FF" />
 
-			<object type="image">
-				<image resource="side" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="image">
-				<image resource="side" />
-				<placement x="994" y="0" />
-			</object>
-
 			<object type="image">
 				<image resource="base" />
 				<placement x="0" y="0" />
 			</object>
 
-			<object type="image">
-				<image resource="bottom" />
-				<placement x="1" y="570" />
-			</object>
-
-			<object type="image">
-				<image resource="large_black" />
-				<placement x="0" y="0" />
-			</object>
-
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="250" y="5" />
-				<text>Team Win Recovery Project (twrp)  v%tw_version%</text>
+				<text>Team Win Recovery Project  v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -1259,6 +1236,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%filemanager_select_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/1024x768/res/images/background.jpg b/gui/devices/1024x768/res/images/background.jpg
index 6ff8d4d1..2ac48e0a 100644
Binary files a/gui/devices/1024x768/res/images/background.jpg and b/gui/devices/1024x768/res/images/background.jpg differ
diff --git a/gui/devices/1024x768/res/images/backgroundbottom.jpg b/gui/devices/1024x768/res/images/backgroundbottom.jpg
deleted file mode 100644
index 04aede00..00000000
Binary files a/gui/devices/1024x768/res/images/backgroundbottom.jpg and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/backgroundside.jpg b/gui/devices/1024x768/res/images/backgroundside.jpg
deleted file mode 100644
index b3eba28d..00000000
Binary files a/gui/devices/1024x768/res/images/backgroundside.jpg and /dev/null differ
diff --git a/gui/devices/1024x768/res/images/large_black.png b/gui/devices/1024x768/res/images/large_black.png
deleted file mode 100644
index aaf8d3b5..00000000
Binary files a/gui/devices/1024x768/res/images/large_black.png and /dev/null differ
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index dd53da41..86cfddab 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -12,9 +12,6 @@
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Regular-20" />
 		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="side" type="image" filename="backgroundside.jpg" />
-		<resource name="bottom" type="image" filename="backgroundbottom.jpg" />
-		<resource name="large_black" type="image" filename="large_black" />
 		<resource name="main_button" type="image" filename="button" />
 		<resource name="file_icon" type="image" filename="file" />
 		<resource name="folder_icon" type="image" filename="folder" />
@@ -212,35 +209,15 @@
 		<template name="header">
 			<background color="#000000FF" />
 
-			<object type="image">
-				<image resource="side" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="image">
-				<image resource="side" />
-				<placement x="994" y="0" />
-			</object>
-
 			<object type="image">
 				<image resource="base" />
 				<placement x="0" y="0" />
 			</object>
 
-			<object type="image">
-				<image resource="bottom" />
-				<placement x="1" y="738" />
-			</object>
-
-			<object type="image">
-				<image resource="large_black" />
-				<placement x="0" y="0" />
-			</object>
-
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="250" y="5" />
-				<text>Team Win Recovery Project (twrp)  v%tw_version%</text>
+				<text>Team Win Recovery Project  v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -1259,6 +1236,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%filemanager_select_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/1080x1920/res/images/top-bar.jpg b/gui/devices/1080x1920/res/images/top-bar.jpg
index 5277f597..5121a031 100644
Binary files a/gui/devices/1080x1920/res/images/top-bar.jpg and b/gui/devices/1080x1920/res/images/top-bar.jpg differ
diff --git a/gui/devices/1080x1920/res/ui.xml b/gui/devices/1080x1920/res/ui.xml
index 1c757fa1..e23086ac 100644
--- a/gui/devices/1080x1920/res/ui.xml
+++ b/gui/devices/1080x1920/res/ui.xml
@@ -179,7 +179,7 @@
 		<variable name="backup_button_row2" value="1220" />
 		<variable name="mount_list_height" value="1035" />
 		<variable name="mount_storage_row" value="1240" />
-		<variable name="storage_list_height" value="1313" />
+		<variable name="storage_list_height" value="1000" />
 		<variable name="wipe_list_height" value="1305" />
 		<variable name="wipe_button_y" value="975" />
 		<variable name="slidervalue_w" value="1060" />
@@ -2097,6 +2097,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/1280x800/res/images/background.jpg b/gui/devices/1280x800/res/images/background.jpg
index 3f9257d8..d9681c62 100644
Binary files a/gui/devices/1280x800/res/images/background.jpg and b/gui/devices/1280x800/res/images/background.jpg differ
diff --git a/gui/devices/1280x800/res/images/backgroundbottom.jpg b/gui/devices/1280x800/res/images/backgroundbottom.jpg
deleted file mode 100644
index 432ca4db..00000000
Binary files a/gui/devices/1280x800/res/images/backgroundbottom.jpg and /dev/null differ
diff --git a/gui/devices/1280x800/res/images/backgroundside.jpg b/gui/devices/1280x800/res/images/backgroundside.jpg
deleted file mode 100644
index bc3c8aba..00000000
Binary files a/gui/devices/1280x800/res/images/backgroundside.jpg and /dev/null differ
diff --git a/gui/devices/1280x800/res/images/large_black.png b/gui/devices/1280x800/res/images/large_black.png
deleted file mode 100644
index 43e0cc76..00000000
Binary files a/gui/devices/1280x800/res/images/large_black.png and /dev/null differ
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index 8babda14..4a066a3b 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -12,9 +12,6 @@
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Regular-20" />
 		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="side" type="image" filename="backgroundside.jpg" />
-		<resource name="bottom" type="image" filename="backgroundbottom.jpg" />
-		<resource name="large_black" type="image" filename="large_black" />
 		<resource name="main_button" type="image" filename="button" />
 		<resource name="file_icon" type="image" filename="file" />
 		<resource name="folder_icon" type="image" filename="folder" />
@@ -212,35 +209,15 @@
 		<template name="header">
 			<background color="#000000FF" />
 
-			<object type="image">
-				<image resource="side" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="image">
-				<image resource="side" />
-				<placement x="1250" y="0" />
-			</object>
-
 			<object type="image">
 				<image resource="base" />
 				<placement x="0" y="0" />
 			</object>
 
-			<object type="image">
-				<image resource="bottom" />
-				<placement x="1" y="770" />
-			</object>
-
-			<object type="image">
-				<image resource="large_black" />
-				<placement x="0" y="0" />
-			</object>
-
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="250" y="5" />
-				<text>Team Win Recovery Project (twrp)  v%tw_version%</text>
+				<text>Team Win Recovery Project  v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -1259,6 +1236,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%filemanager_select_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/1920x1200/res/images/background.jpg b/gui/devices/1920x1200/res/images/background.jpg
index f7faabaf..2e5da0a7 100644
Binary files a/gui/devices/1920x1200/res/images/background.jpg and b/gui/devices/1920x1200/res/images/background.jpg differ
diff --git a/gui/devices/1920x1200/res/images/backgroundbottom.jpg b/gui/devices/1920x1200/res/images/backgroundbottom.jpg
deleted file mode 100644
index 6af64da2..00000000
Binary files a/gui/devices/1920x1200/res/images/backgroundbottom.jpg and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/backgroundside.jpg b/gui/devices/1920x1200/res/images/backgroundside.jpg
deleted file mode 100644
index f5a1060e..00000000
Binary files a/gui/devices/1920x1200/res/images/backgroundside.jpg and /dev/null differ
diff --git a/gui/devices/1920x1200/res/images/large_black.png b/gui/devices/1920x1200/res/images/large_black.png
deleted file mode 100644
index 91948eef..00000000
Binary files a/gui/devices/1920x1200/res/images/large_black.png and /dev/null differ
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index 0cc4d7e0..458a7237 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -12,9 +12,6 @@
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Regular-30" />
 		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="side" type="image" filename="backgroundside.jpg" />
-		<resource name="bottom" type="image" filename="backgroundbottom.jpg" />
-		<resource name="large_black" type="image" filename="large_black" />
 		<resource name="main_button" type="image" filename="button" />
 		<resource name="file_icon" type="image" filename="file" />
 		<resource name="folder_icon" type="image" filename="folder" />
@@ -212,35 +209,15 @@
 		<template name="header">
 			<background color="#000000FF" />
 
-			<object type="image">
-				<image resource="side" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="image">
-				<image resource="side" />
-				<placement x="1875" y="0" />
-			</object>
-
 			<object type="image">
 				<image resource="base" />
 				<placement x="0" y="0" />
 			</object>
 
-			<object type="image">
-				<image resource="bottom" />
-				<placement x="1" y="1155" />
-			</object>
-
-			<object type="image">
-				<image resource="large_black" />
-				<placement x="0" y="0" />
-			</object>
-
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="250" y="5" />
-				<text>Team Win Recovery Project (twrp)  v%tw_version%</text>
+				<text>Team Win Recovery Project  v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -1259,6 +1236,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%filemanager_select_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/2560x1600/res/images/background.jpg b/gui/devices/2560x1600/res/images/background.jpg
index 9d409090..3b8a71ac 100644
Binary files a/gui/devices/2560x1600/res/images/background.jpg and b/gui/devices/2560x1600/res/images/background.jpg differ
diff --git a/gui/devices/2560x1600/res/images/backgroundbottom.jpg b/gui/devices/2560x1600/res/images/backgroundbottom.jpg
deleted file mode 100644
index e6ad724d..00000000
Binary files a/gui/devices/2560x1600/res/images/backgroundbottom.jpg and /dev/null differ
diff --git a/gui/devices/2560x1600/res/images/backgroundside.jpg b/gui/devices/2560x1600/res/images/backgroundside.jpg
deleted file mode 100644
index 455806d0..00000000
Binary files a/gui/devices/2560x1600/res/images/backgroundside.jpg and /dev/null differ
diff --git a/gui/devices/2560x1600/res/images/large_black.png b/gui/devices/2560x1600/res/images/large_black.png
deleted file mode 100644
index bf93e2b0..00000000
Binary files a/gui/devices/2560x1600/res/images/large_black.png and /dev/null differ
diff --git a/gui/devices/2560x1600/res/ui.xml b/gui/devices/2560x1600/res/ui.xml
index c9e6c696..6a77a4fc 100644
--- a/gui/devices/2560x1600/res/ui.xml
+++ b/gui/devices/2560x1600/res/ui.xml
@@ -12,9 +12,6 @@
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Regular-40" />
 		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="side" type="image" filename="backgroundside.jpg" />
-		<resource name="bottom" type="image" filename="backgroundbottom.jpg" />
-		<resource name="large_black" type="image" filename="large_black" />
 		<resource name="main_button" type="image" filename="button" />
 		<resource name="file_icon" type="image" filename="file" />
 		<resource name="folder_icon" type="image" filename="folder" />
@@ -212,35 +209,15 @@
 		<template name="header">
 			<background color="#000000FF" />
 
-			<object type="image">
-				<image resource="side" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="image">
-				<image resource="side" />
-				<placement x="2500" y="0" />
-			</object>
-
 			<object type="image">
 				<image resource="base" />
 				<placement x="0" y="0" />
 			</object>
 
-			<object type="image">
-				<image resource="bottom" />
-				<placement x="1" y="1540" />
-			</object>
-
-			<object type="image">
-				<image resource="large_black" />
-				<placement x="0" y="0" />
-			</object>
-
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="400" y="8" />
-				<text>Team Win Recovery Project (twrp)  v%tw_version%</text>
+				<text>Team Win Recovery Project  v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -1259,6 +1236,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%filemanager_select_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/320x480/res/images/top-bar.jpg b/gui/devices/320x480/res/images/top-bar.jpg
index 351f58b2..a0d50687 100644
Binary files a/gui/devices/320x480/res/images/top-bar.jpg and b/gui/devices/320x480/res/images/top-bar.jpg differ
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index 6d258b06..041a1356 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -174,7 +174,7 @@
 		<variable name="backup_button_row2" value="326" />
 		<variable name="mount_list_height" value="270" />
 		<variable name="mount_storage_row" value="340" />
-		<variable name="storage_list_height" value="340" />
+		<variable name="storage_list_height" value="290" />
 		<variable name="wipe_list_height" value="330" />
 		<variable name="wipe_button_y" value="270" />
 		<variable name="slidervalue_w" value="304" />
@@ -2084,6 +2084,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/480x800/res/images/top-bar.jpg b/gui/devices/480x800/res/images/top-bar.jpg
index 97a0b5fc..d8ab933b 100644
Binary files a/gui/devices/480x800/res/images/top-bar.jpg and b/gui/devices/480x800/res/images/top-bar.jpg differ
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index fdebf15f..2b428b40 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -281,7 +281,7 @@
 
 			<object type="button">
 				<placement x="%sort_col1_button_x%" y="%sort_asc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Name</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=1</action>
@@ -289,7 +289,7 @@
 
 			<object type="button">
 				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Date</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=2</action>
@@ -297,7 +297,7 @@
 
 			<object type="button">
 				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Size</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=3</action>
@@ -311,7 +311,7 @@
 
 			<object type="button">
 				<placement x="%sort_col1_button_x%" y="%sort_desc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Name</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=-1</action>
@@ -319,7 +319,7 @@
 
 			<object type="button">
 				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Date</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=-2</action>
@@ -327,7 +327,7 @@
 
 			<object type="button">
 				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Size</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=-3</action>
@@ -2084,6 +2084,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/480x854/res/images/top-bar.jpg b/gui/devices/480x854/res/images/top-bar.jpg
index 97a0b5fc..d8ab933b 100644
Binary files a/gui/devices/480x854/res/images/top-bar.jpg and b/gui/devices/480x854/res/images/top-bar.jpg differ
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index b2a5f4c6..f8d6da16 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -280,7 +280,7 @@
 
 			<object type="button">
 				<placement x="%sort_col1_button_x%" y="%sort_asc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Name</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=1</action>
@@ -288,7 +288,7 @@
 
 			<object type="button">
 				<placement x="%sort_col2_button_x%" y="%sort_asc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Date</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=2</action>
@@ -296,7 +296,7 @@
 
 			<object type="button">
 				<placement x="%sort_col3_button_x%" y="%sort_asc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Size</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=3</action>
@@ -310,7 +310,7 @@
 
 			<object type="button">
 				<placement x="%sort_col1_button_x%" y="%sort_desc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Name</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=-1</action>
@@ -318,7 +318,7 @@
 
 			<object type="button">
 				<placement x="%sort_col2_button_x%" y="%sort_desc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Date</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=-2</action>
@@ -326,7 +326,7 @@
 
 			<object type="button">
 				<placement x="%sort_col3_button_x%" y="%sort_desc_button_y%" />
-				<font resource="UItext" color="%button_text_color%" />
+				<font resource="font" color="%button_text_color%" />
 				<text>Size</text>
 				<image resource="sort_button" />
 				<action function="set">tw_gui_sort_order=-3</action>
@@ -2083,6 +2083,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/540x960/res/images/top-bar.jpg b/gui/devices/540x960/res/images/top-bar.jpg
index 45f4208b..fbe72302 100644
Binary files a/gui/devices/540x960/res/images/top-bar.jpg and b/gui/devices/540x960/res/images/top-bar.jpg differ
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index c6b0c925..7448ddf6 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -174,7 +174,7 @@
 		<variable name="backup_button_row2" value="645" />
 		<variable name="mount_list_height" value="500" />
 		<variable name="mount_storage_row" value="630" />
-		<variable name="storage_list_height" value="675" />
+		<variable name="storage_list_height" value="575" />
 		<variable name="wipe_list_height" value="670" />
 		<variable name="wipe_button_y" value="475" />
 		<variable name="slidervalue_w" value="520" />
@@ -2084,6 +2084,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/720x1280/res/images/top-bar.jpg b/gui/devices/720x1280/res/images/top-bar.jpg
index a0909d5e..02c8051b 100644
Binary files a/gui/devices/720x1280/res/images/top-bar.jpg and b/gui/devices/720x1280/res/images/top-bar.jpg differ
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index 54811146..2319c555 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -179,7 +179,7 @@
 		<variable name="backup_button_row2" value="810" />
 		<variable name="mount_list_height" value="690" />
 		<variable name="mount_storage_row" value="820" />
-		<variable name="storage_list_height" value="875" />
+		<variable name="storage_list_height" value="775" />
 		<variable name="wipe_list_height" value="870" />
 		<variable name="wipe_button_y" value="650" />
 		<variable name="slidervalue_w" value="700" />
@@ -2097,6 +2097,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/800x1280/res/images/top-bar.jpg b/gui/devices/800x1280/res/images/top-bar.jpg
index 0a91ac7b..265b717b 100644
Binary files a/gui/devices/800x1280/res/images/top-bar.jpg and b/gui/devices/800x1280/res/images/top-bar.jpg differ
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index a6931b23..692c736c 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -175,7 +175,7 @@
 		<variable name="backup_button_row2" value="810" />
 		<variable name="mount_list_height" value="690" />
 		<variable name="mount_storage_row" value="830" />
-		<variable name="storage_list_height" value="875" />
+		<variable name="storage_list_height" value="775" />
 		<variable name="wipe_list_height" value="870" />
 		<variable name="wipe_button_y" value="650" />
 		<variable name="slidervalue_w" value="780" />
@@ -2085,6 +2085,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%col_center_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>
diff --git a/gui/devices/800x480/res/images/background.jpg b/gui/devices/800x480/res/images/background.jpg
index b13e1b8a..af825314 100644
Binary files a/gui/devices/800x480/res/images/background.jpg and b/gui/devices/800x480/res/images/background.jpg differ
diff --git a/gui/devices/800x480/res/images/backgroundbottom.jpg b/gui/devices/800x480/res/images/backgroundbottom.jpg
deleted file mode 100644
index be091865..00000000
Binary files a/gui/devices/800x480/res/images/backgroundbottom.jpg and /dev/null differ
diff --git a/gui/devices/800x480/res/images/backgroundside.jpg b/gui/devices/800x480/res/images/backgroundside.jpg
deleted file mode 100644
index 2e9d9cdf..00000000
Binary files a/gui/devices/800x480/res/images/backgroundside.jpg and /dev/null differ
diff --git a/gui/devices/800x480/res/images/large_black.png b/gui/devices/800x480/res/images/large_black.png
deleted file mode 100644
index 86b2dfcf..00000000
Binary files a/gui/devices/800x480/res/images/large_black.png and /dev/null differ
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index 562cb169..768f246f 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -12,9 +12,6 @@
 	<resources>
 		<resource name="font" type="font" filename="Roboto-Condensed-16" />
 		<resource name="base" type="image" filename="background.jpg" />
-		<resource name="side" type="image" filename="backgroundside.jpg" />
-		<resource name="bottom" type="image" filename="backgroundbottom.jpg" />
-		<resource name="large_black" type="image" filename="large_black" />
 		<resource name="main_button" type="image" filename="button" />
 		<resource name="file_icon" type="image" filename="file" />
 		<resource name="folder_icon" type="image" filename="folder" />
@@ -137,7 +134,7 @@
 		<variable name="console_installdone_height" value="260" />
 		<variable name="fileselector_folder_x" value="28" />
 		<variable name="fileselector_folder_width" value="248" />
-		<variable name="fileselector_folderonly_width" value="460" />
+		<variable name="fileselector_folderonly_width" value="400" />
 		<variable name="fileselector_file_x" value="278" />
 		<variable name="fileselector_file_width" value="506" />
 		<variable name="fileselector_install_y" value="120" />
@@ -212,35 +209,15 @@
 		<template name="header">
 			<background color="#000000FF" />
 
-			<object type="image">
-				<image resource="side" />
-				<placement x="0" y="0" />
-			</object>
-
-			<object type="image">
-				<image resource="side" />
-				<placement x="770" y="0" />
-			</object>
-
 			<object type="image">
 				<image resource="base" />
 				<placement x="0" y="0" />
 			</object>
 
-			<object type="image">
-				<image resource="bottom" />
-				<placement x="1" y="450" />
-			</object>
-
-			<object type="image">
-				<image resource="large_black" />
-				<placement x="0" y="0" />
-			</object>
-
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="250" y="2" />
-				<text>Team Win Recovery Project (twrp)  v%tw_version%</text>
+				<text>Team Win Recovery Project  v%tw_version%</text>
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -1267,6 +1244,18 @@
 				<listtype name="storage" />
 			</object>
 
+			<object type="button">
+				<highlight color="%highlight_color%" />
+				<placement x="%filemanager_select_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>OK</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_clear_destination=%tw_back%</action>
+					<action function="page">clear_vars</action>
+				</actions>
+			</object>
+
 			<object type="action">
 				<touch key="home" />
 				<action function="page">main</action>