3 files changed, 24 insertions, 18 deletions

diff --git a/gui/devices/480x800/res/images/top-bar.jpg b/gui/devices/480x800/res/images/top-bar.jpg
deleted file mode 100644
index 3e0e5b562..000000000
--- a/gui/devices/480x800/res/images/top-bar.jpg
+++ /dev/null
diff --git a/gui/devices/480x800/res/images/twrplogo.png b/gui/devices/480x800/res/images/twrplogo.png
new file mode 100644
index 000000000..4b39da89b
--- /dev/null
+++ b/gui/devices/480x800/res/images/twrplogo.png
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index 53441fd36..3a9cd8617 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -17,11 +17,11 @@
 		<resource name="font" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
 		<resource name="mediumfont" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
 		<resource name="filelist" type="font" filename="RobotoCondensed-Regular.ttf" size="20" fallback="Roboto-Regular-20" />
-		<resource name="top_bar" type="image" filename="top-bar.jpg" />
+		<resource name="twrplogo" type="image" filename="twrplogo" retainaspect="1" />
 		<resource name="main_button" type="image" filename="menu-button" />
-		<resource name="file_icon" type="image" filename="file" />
-		<resource name="folder_icon" type="image" filename="folder" />
-		<resource name="slideout" type="image" filename="slideout" />
+		<resource name="file_icon" type="image" filename="file" retainaspect="1" />
+		<resource name="folder_icon" type="image" filename="folder" retainaspect="1" />
+		<resource name="slideout" type="image" filename="slideout" retainaspect="1" />
 		<resource name="progress" type="animation" filename="indeterminate" />
 		<resource name="progress_empty" type="image" filename="progress_empty" />
 		<resource name="progress_full" type="image" filename="progress_fill" />
@@ -33,12 +33,12 @@
 		<resource name="sort_button" type="image" filename="sort-button" />
 		<resource name="minus_button" type="image" filename="minus-button" />
 		<resource name="plus_button" type="image" filename="plus-button" />
-		<resource name="home_icon" type="image" filename="home-icon" />
-		<resource name="back_icon" type="image" filename="back-icon" />
-		<resource name="slider" type="image" filename="slider" />
-		<resource name="slider-used" type="image" filename="slider-used" />
-		<resource name="slider-touch" type="image" filename="slider-touch" />
-		<resource name="unlock-icon" type="image" filename="unlock" />
+		<resource name="home_icon" type="image" filename="home-icon" retainaspect="1" />
+		<resource name="back_icon" type="image" filename="back-icon" retainaspect="1" />
+		<resource name="slider" type="image" filename="slider" retainaspect="1" />
+		<resource name="slider-used" type="image" filename="slider-used" retainaspect="1" />
+		<resource name="slider-touch" type="image" filename="slider-touch" retainaspect="1" />
+		<resource name="unlock-icon" type="image" filename="unlock" retainaspect="1" />
 		<resource name="keyboard1" type="image" filename="keyboard1" />
 		<resource name="keyboard2" type="image" filename="keyboard2" />
 		<resource name="keyboard3" type="image" filename="keyboard3" />
@@ -94,7 +94,6 @@
 		<variable name="row5_medium_y" value="430" />
 		<variable name="row6_medium_y" value="505" />
 		<variable name="row7_medium_y" value="580" />
-		<variable name="slider_x" value="58" />
 		<variable name="slider_y" value="680" />
 		<variable name="slider_text_y" value="721" />
 		<variable name="button_text_color" value="#AAAAAA" />
@@ -105,7 +104,7 @@
 		<variable name="caps_highlight_color" value="#33B5E580" />
 		<variable name="home_button_x" value="10" />
 		<variable name="home_button_y" value="766" />
-		<variable name="back_button_x" value="413" />
+		<variable name="back_button_x" value="470" />
 		<variable name="back_button_y" value="766" />
 		<variable name="sort_asc_text_y" value="685" />
 		<variable name="sort_asc_button_y" value="685" />
@@ -162,8 +161,7 @@
 		<variable name="sdswap_text_y" value="190" />
 		<variable name="sdfilesystem_text_y" value="240" />
 		<variable name="sdfilesystem_button_y" value="280" />
-		<variable name="lock_x" value="40" />
-		<variable name="lock_y" value="200" />
+		<variable name="lock_y" value="250" />
 		<variable name="filemanager_select_x" value="365" />
 		<variable name="filemanager_select_y" value="690" />
 		<variable name="backup_name_y" value="350" />
@@ -207,9 +205,17 @@
 		<template name="header">
 			<background color="%backgroundcolor%" />
 
+			<object type="fill" color="%button_fill_color%">
+				<placement x="0" y="0" w="480" h="98" />
+			</object>
+
+			<object type="fill" color="%highlight%">
+				<placement x="0" y="98" w="480" h="2" />
+			</object>
+
 			<object type="image">
-				<image resource="top_bar" />
-				<placement x="0" y="0" />
+				<image resource="twrplogo" />
+				<placement x="50" y="50" placement="4" />
 			</object>
 
 			<object type="text" color="%text_color%">
@@ -261,7 +267,7 @@
 			</object>
 
 			<object type="button">
-				<placement x="%back_button_x%" y="%back_button_y%" />
+				<placement x="%back_button_x%" y="%back_button_y%" placement="1" />
 				<font resource="font" color="%button_text_color%" />
 				<text></text>
 				<image resource="back_icon" />
@@ -367,7 +373,7 @@
 
 		<template name="footer">
 			<object type="console">
-				<slideout resource="slideout" x="210" y="760" />
+				<slideout resource="slideout" x="%center_x%" y="760" placement="5" />
 				<placement x="%console_x%" y="0" w="%console_width%" h="760" />
 				<color foreground="%console_foreground%" background="%console_background%" scroll="%console_scroll%" />
 				<font resource="fixed" />