diff --git a/gui/action.cpp b/gui/action.cpp
index 1132a20..d636934 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -715,6 +715,8 @@
 
 					DataManager::GetValue(TW_EXTERNAL_PATH, External_Path);
 					ret_val = PartitionManager.Wipe_By_Path(External_Path);
+				} else if (arg == "ANDROIDSECURE") {
+					ret_val = PartitionManager.Wipe_Android_Secure();
 				} else
 					ret_val = PartitionManager.Wipe_By_Path(arg);
 
diff --git a/gui/devices/1024x600/res/ui.xml b/gui/devices/1024x600/res/ui.xml
index f320926..7a0bbd0 100755
--- a/gui/devices/1024x600/res/ui.xml
+++ b/gui/devices/1024x600/res/ui.xml
@@ -1583,6 +1583,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col3_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col4_x%" y="%row2_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/1024x768/res/ui.xml b/gui/devices/1024x768/res/ui.xml
index 02f0e1c..cc9701b 100644
--- a/gui/devices/1024x768/res/ui.xml
+++ b/gui/devices/1024x768/res/ui.xml
@@ -1583,6 +1583,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col3_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col4_x%" y="%row2_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/1280x800/res/ui.xml b/gui/devices/1280x800/res/ui.xml
index 94df418..2e5b329 100644
--- a/gui/devices/1280x800/res/ui.xml
+++ b/gui/devices/1280x800/res/ui.xml
@@ -1583,6 +1583,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col3_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col4_x%" y="%row2_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index a3eb3f9..17ccfe9 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -1583,6 +1583,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col3_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col4_x%" y="%row2_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/320x480/res/ui.xml b/gui/devices/320x480/res/ui.xml
index bcc0211..efa980a 100644
--- a/gui/devices/320x480/res/ui.xml
+++ b/gui/devices/320x480/res/ui.xml
@@ -1163,6 +1163,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col1_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/480x800/res/ui.xml b/gui/devices/480x800/res/ui.xml
index 729b0c2..435efb0 100644
--- a/gui/devices/480x800/res/ui.xml
+++ b/gui/devices/480x800/res/ui.xml
@@ -1162,6 +1162,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col1_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/480x854/res/ui.xml b/gui/devices/480x854/res/ui.xml
index d44d28c..ff00357 100644
--- a/gui/devices/480x854/res/ui.xml
+++ b/gui/devices/480x854/res/ui.xml
@@ -1161,6 +1161,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col1_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/540x960/res/ui.xml b/gui/devices/540x960/res/ui.xml
index d673bc0..ca008d5 100644
--- a/gui/devices/540x960/res/ui.xml
+++ b/gui/devices/540x960/res/ui.xml
@@ -1162,6 +1162,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col1_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/720x1280/res/ui.xml b/gui/devices/720x1280/res/ui.xml
index dade882..d0973b2 100644
--- a/gui/devices/720x1280/res/ui.xml
+++ b/gui/devices/720x1280/res/ui.xml
@@ -1167,6 +1167,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col1_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/800x1280/res/ui.xml b/gui/devices/800x1280/res/ui.xml
index 0ca35eb..b7c1e04 100755
--- a/gui/devices/800x1280/res/ui.xml
+++ b/gui/devices/800x1280/res/ui.xml
@@ -1163,6 +1163,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col1_x%" y="%row4_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col2_x%" y="%row4_y%" />
 				<font resource="font" color="%button_text_color%" />
diff --git a/gui/devices/800x480/res/ui.xml b/gui/devices/800x480/res/ui.xml
index e3ac816..4454ffe 100755
--- a/gui/devices/800x480/res/ui.xml
+++ b/gui/devices/800x480/res/ui.xml
@@ -1583,6 +1583,24 @@
 			</object>
 
 			<object type="button">
+				<condition var1="tw_has_data_media" var2="0" />
+				<placement x="%col3_x%" y="%row2_y%" />
+				<font resource="font" color="%button_text_color%" />
+				<text>Android Secure</text>
+				<image resource="main_button" />
+				<actions>
+					<action function="set">tw_back=wipe</action>
+					<action function="set">tw_action=wipe</action>
+					<action function="set">tw_action_param=ANDROIDSECURE</action>
+					<action function="set">tw_text1=Wipe Android Secure?</action>
+					<action function="set">tw_action_text1=Wiping Android Secure...</action>
+					<action function="set">tw_complete_text1=Wipe Android Secure Complete</action>
+					<action function="set">tw_slider_text=Swipe to Format</action>
+					<action function="page">confirm_action</action>
+				</actions>
+			</object>
+
+			<object type="button">
 				<condition var1="tw_has_sdext_partition" var2="1" />
 				<placement x="%col4_x%" y="%row2_y%" />
 				<font resource="font" color="%button_text_color%" />