Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r16415 -r16416
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16415)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 16416)
@@ -343,8 +343,13 @@
 <inp2:m_DefineElement name="inp_edit_swf_upload" LinkPrefix="m" LinkTag="t" class="" style="">
 	<inp2:m_RenderElement design="form_row" block_name="inp_edit_swf_upload" pass_params="1">
 		<td class="control-cell">
-			<div style="width: 63px; height: 21px;" id="<inp2:{$prefix}_InputName field='$field'/>_place_holder">
-				&nbsp;
+			<inp2:m_ifnot check="m_Get" name="plupload_included">
+				<script type="text/javascript" src="<inp2:m_Compress files='js/uploader/moxie.js|js/uploader/plupload.dev.js'/>"></script>
+				<inp2:m_Set plupload_included="1"/>
+			</inp2:m_ifnot>
+
+			<div id="<inp2:{$prefix}_InputName field='$field'/>_container">
+				<button class="button button-disabled" disabled id="<inp2:{$prefix}_InputName field='$field'/>_browse_button">Browse</button>
 			</div>
 
 			<div id="<inp2:{$prefix}_InputName field='$field'/>_queueinfo" class="uploader-queue"></div>
@@ -373,16 +378,6 @@
 						uploadURL : '<inp2:{$LinkPrefix}_{$LinkTag} pass="all,$prefix" {$prefix}_event="OnUploadFile" no_amp="1" js_escape="1"/>',
 						deleteURL : '<inp2:{$LinkPrefix}_{$LinkTag} pass="all,$prefix" {$prefix}_event="OnDeleteFile" field_id="#FIELD_ID#" file="#FILE#" no_amp="1" js_escape="1"/>',
 						previewURL : '<inp2:{$LinkPrefix}_{$LinkTag} pass="all,$prefix" {$prefix}_event="OnViewFile" field="#FIELD#" file="#FILE#" no_amp="1" js_escape="1"/>',
-
-						// Button settings
-						buttonImageURL: 'img/upload.png',	// Relative to the Flash file
-						buttonWidth: 63,
-						buttonHeight: 21,
-						buttonText: '<span class="theFont">Browse</span>',
-						buttonTextStyle: ".theFont { font-size: 12; font-family: arial, sans}",
-						buttonTextTopPadding: 2,
-						buttonTextLeftPadding: 9,
-						buttonPlaceholderId: '<inp2:{$prefix}_InputName field="$field"/>_place_holder',
 						ajax: <inp2:m_if check="m_Get" name="ajax" equals_to="yes">true<inp2:m_else/>false</inp2:m_if>
 					}
 				)