diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 7ce8d653..ba96e418 100644
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -3180,14 +3180,21 @@
 				<text>{@part_sd_hdr=Partition SD Card}</text>
 			</text>
 
-			<partitionlist style="partitionlist_storage">
+			<partitionlist>
+				<placement x="%col1_x_left%" y="%row1a_y%" w="%content_width%" h="%partitionlist_mount_height%"/>
 				<text>{@sel_storage_list=Select Storage}</text>
 				<data name="tw_storage_path"/>
 				<listtype name="storage"/>
 			</partitionlist>
 
-			<button style="button_third_width">
-				<placement x="%dialog_button_x%" y="%row13_y%"/>
+			<text style="text_m_fail">
+				<condition var1="partitionlisterror" var2="1"/>
+				<placement x="%center_x%" y="%row14_y%" placement="5"/>
+				<text>{@invalid_partsd_sel=You must select a removable device}</text>
+			</text>
+
+			<button style="main_button_half_width">
+				<placement x="%col2_x_right%" y="%row15a_y%"/>
 				<text>{@ok_btn=OK}</text>
 				<actions>
 					<action function="getpartitiondetails">tw_storage_path</action>
@@ -3195,12 +3202,6 @@
 				</actions>
 			</button>
 
-			<text style="text_m_fail">
-				<condition var1="partitionlisterror" var2="1"/>
-				<placement x="%center_x%" y="%row17_y%" placement="5"/>
-				<text>{@invalid_partsd_sel=You must select a removable device}</text>
-			</text>
-
 			<action>
 				<touch key="home"/>
 				<action function="page">main</action>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 8e1a0d27..0ac2dfb8 100644
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -3254,7 +3254,8 @@
 				<text>{@part_sd_hdr=Partition SD Card}</text>
 			</text>
 
-			<partitionlist style="partitionlist_storage">
+			<partitionlist>
+				<placement x="%indent%" y="%row1a_y%" w="%content_width%" h="%partitionlist_storage_height%"/>
 				<text>{@sel_storage_list=Select Storage}</text>
 				<data name="tw_storage_path"/>
 				<listtype name="storage"/>
@@ -3262,12 +3263,12 @@
 
 			<text style="text_m_fail">
 				<condition var1="partitionlisterror" var2="1"/>
-				<placement x="%center_x%" y="%row17_y%" placement="5"/>
+				<placement x="%center_x%" y="%row20_y%" placement="5"/>
 				<text>{@invalid_partsd_sel=You must select a removable device}</text>
 			</text>
 
-			<button style="button_third_width">
-				<placement x="%dialog_button_x%" y="%row14_y%"/>
+			<button style="main_button_half_height">
+				<placement x="%center_x%" y="%row21a_y%"/>
 				<text>{@ok_btn=OK}</text>
 				<actions>
 					<action function="getpartitiondetails">tw_storage_path</action>