Index: branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl
===================================================================
diff -u -N -r10961 -r11368
--- branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 10961)
+++ branches/RC/core/admin_templates/custom_fields/custom_fields_list.tpl	(.../custom_fields_list.tpl)	(revision 11368)
@@ -61,19 +61,16 @@
 				a_toolbar.Render();
 			</script>
 		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="cf" grid="Default"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="cf_grid_data_td" >
-	<td valign="top" class="text"><inp2:{$PrefixSpecial}_field field="$field" grid="$grid" no_special="no_special" as_label="1" /></td>
+<inp2:m_DefineElement name="cf_grid_data_td">
+	<inp2:Field field="$field" grid="$grid" no_special="no_special" as_label="1" />
 </inp2:m_DefineElement>
 
-
-<inp2:m_DefineElement name="preview" >
-	<inp2:m_RenderElement name="preview_td" PrefixSpecial="$PrefixSpecial" field="$field" type="auto" max_width="100" max_height="100"/>
-</inp2:m_DefineElement>
-
 <inp2:m_RenderElement name="grid" PrefixSpecial="cf" IdField="CustomFieldId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
 <script type="text/javascript">
 	Grids['cf'].SetDependantToolbarButtons( new Array('edit','delete', 'clone', 'move_down', 'move_up') );