diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index d0012c0a..cee7c155 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -1017,16 +1017,6 @@
 				<text>Factory Reset: Wipes Data, Cache, and Dalvik</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<conditions>
-					<condition var1="tw_has_android_secure" var2="1" />
-					<condition var1="fileexists" var2="/and-sec" />
-				</conditions>
-				<font resource="font" />
-				<placement x="%center_x%" y="%row2_text_y%" placement="5" />
-				<text>.android_secure</text>
-			</object>
-
 			<object type="text" color="%text_color%">
 				<condition var1="tw_has_data_media" var2="1" />
 				<font resource="font" />
@@ -1034,11 +1024,21 @@
 				<text>(not including internal storage)</text>
 			</object>
 
+			<object type="text" color="%text_color%">
+				<conditions>
+					<condition var1="tw_has_android_secure" var2="1" />
+					<condition var1="fileexists" var2="/and-sec" />
+				</conditions>
+				<font resource="font" />
+				<placement x="%center_x%" y="%row3_text_y%" placement="1" />
+				<text>Android Secure  </text>
+			</object>
+
 			<object type="text" color="%text_color%">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<font resource="font" />
-				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
-				<text>SD-EXT</text>
+				<placement x="%center_x%" y="%row3_text_y%" />
+				<text>  SD-EXT</text>
 			</object>
 
 			<object type="text" color="%text_color%">
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index 8d749c12..9a957101 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -714,16 +714,6 @@
 				<text>Wipes Data, Cache, and Dalvik</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<conditions>
-					<condition var1="tw_has_android_secure" var2="1" />
-					<condition var1="fileexists" var2="/and-sec" />
-				</conditions>
-				<font resource="font" />
-				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
-				<text>.android_secure</text>
-			</object>
-
 			<object type="text" color="%text_color%">
 				<condition var1="tw_has_data_media" var2="1" />
 				<font resource="font" />
@@ -732,21 +722,31 @@
 			</object>
 
 			<object type="text" color="%text_color%">
-				<condition var1="tw_has_sdext_partition" var2="1" />
+				<conditions>
+					<condition var1="tw_has_android_secure" var2="1" />
+					<condition var1="fileexists" var2="/and-sec" />
+				</conditions>
 				<font resource="font" />
 				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
+				<text>Android Secure</text>
+			</object>
+
+			<object type="text" color="%text_color%">
+				<condition var1="tw_has_sdext_partition" var2="1" />
+				<font resource="font" />
+				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>SD-EXT</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
 				<text>Most of the time this is</text>
 			</object>
 
 			<object type="text" color="%text_color%">
 				<font resource="font" />
-				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
+				<placement x="%center_x%" y="%row7_text_y%" placement="5" />
 				<text>the only wipe that you need.</text>
 			</object>
 
diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
index 26cf2d51..d3ddc541 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -657,16 +657,6 @@
 				<text>Wipes Data, Cache, and Dalvik</text>
 			</object>
 
-			<object type="text" color="%text_color%">
-				<conditions>
-					<condition var1="tw_has_android_secure" var2="1" />
-					<condition var1="fileexists" var2="/and-sec" />
-				</conditions>
-				<font resource="font" />
-				<placement x="%center_x%" y="%row3_text_y%" placement="5" />
-				<text>.android_secure</text>
-			</object>
-
 			<object type="text" color="%text_color%">
 				<condition var1="tw_has_data_media" var2="1" />
 				<font resource="font" />
@@ -674,11 +664,21 @@
 				<text>(not including internal storage)</text>
 			</object>
 
+			<object type="text" color="%text_color%">
+				<conditions>
+					<condition var1="tw_has_android_secure" var2="1" />
+					<condition var1="fileexists" var2="/and-sec" />
+				</conditions>
+				<font resource="font" />
+				<placement x="%col2_x%" y="%row4_text_y%" placement="1" />
+				<text>Android Secure  </text>
+			</object>
+
 			<object type="text" color="%text_color%">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<font resource="font" />
-				<placement x="%center_x%" y="%row4_text_y%" placement="5" />
-				<text>SD-EXT</text>
+				<placement x="%col2_x%" y="%row4_text_y%" />
+				<text>  SD-EXT</text>
 			</object>
 
 			<object type="text" color="%text_color%">