Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r7014 -r7283
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7014)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7283)
@@ -23,14 +23,17 @@
 <inp2:m_blockend/>
 
 
+<inp2:m_DefineElement name="search_main_toolbar">
+</inp2:m_DefineElement>
+
 <inp2:m_block name="grid_pagination" SearchPrefixSpecial="" ajax="0"/>
 <table cellspacing="0" cellpadding="0" width="100%" bgcolor="#E0E0DA" border="0" class="<inp2:m_if prefix="m" function="ParamEquals" name="no_toolbar" value="no_toolbar"/>tableborder_full_kernel<inp2:m_else/>pagination_bar<inp2:m_endif/>">
 	<tbody>
 		<tr id="MY_ID">
-		  	<td width="100%">
-		  		<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0">
-		  		<b class=text><inp2:m_phrase name="la_Page"/></b>
-		      <inp2:$PrefixSpecial_PrintPages active_block="current_page" split="10" inactive_block="page" prev_page_block="prev_page" next_page_block="next_page" prev_page_split_block="prev_page_split" next_page_split_block="next_page_split" main_special="$main_special" ajax="$ajax" grid="$grid"/>
+	  	<td>
+	  		<img height="15" src="img/arrow.gif" width="15" align="absmiddle" border="0">
+	  		<b class=text><inp2:m_phrase name="la_Page"/></b>
+	      <inp2:$PrefixSpecial_PrintPages active_block="current_page" split="10" inactive_block="page" prev_page_block="prev_page" next_page_block="next_page" prev_page_split_block="prev_page_split" next_page_split_block="next_page_split" main_special="$main_special" ajax="$ajax" grid="$grid"/>
 			</td>
 			<inp2:m_if check="m_ParamEquals" param="search" value="on">
 				<inp2:m_if check="m_ParamEquals" name="SearchPrefixSpecial" value="">
@@ -47,40 +50,43 @@
 
 <inp2:m_DefineElement name="grid_search" ajax="0">
 				<td align="right" class="search-cell">
-					<table width="100%" cellspacing="0" cellpadding="0">
+					<table cellspacing="0" cellpadding="0">
 						<tr>
 							<td><inp2:m_phrase name="la_Search"/>:&nbsp;</td>
 							<td>
 								<input type="text" id="<inp2:m_param name="PrefixSpecial"/>_search_keyword" name="<inp2:m_param name="PrefixSpecial"/>_search_keyword" value="<inp2:m_recall var="{$PrefixSpecial}_search_keyword" no_null="no_null" special="1"/>" onkeydown="search_keydown(event, '<inp2:m_param name="PrefixSpecial"/>', '<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>);" style="border: 1px solid grey;" />
 								<input type="text" style="display: none"; />
 							</td>
-							<td id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
-								<script type="text/javascript">
-									<inp2:m_RenderElement name="grid_search_buttons" pass_params="true"/>
-								</script>
+							<td style="white-space: nowrap" id="search_buttons[<inp2:m_param name="PrefixSpecial"/>]">
+								<div style="white-space: nowrap;"></div>
+									<script type="text/javascript">
+										<inp2:m_RenderElement name="grid_search_buttons" pass_params="true"/>
+									</script>
+
 							</td>
 						</tr>
 					</table>
 				</td>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_search_buttons" PrefixSpecial="" grid="" ajax="1">
-	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'] = new ToolBar('icon16_');
-	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
-		new ToolBarButton(
-					 'search',
-					 '<inp2:m_phrase name="la_ToolTip_Search" escape="1"/>',
-					 function() { search('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
-					 null,
-					 '<inp2:m_param name="PrefixSpecial"/>') );
-	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
-		new ToolBarButton(
-					 'search_reset',
-					 '<inp2:m_phrase name="la_ToolTip_SearchReset" escape="1"/>',
-					 function() { search_reset('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
-					 null,
-					 '<inp2:m_param name="PrefixSpecial"/>') );
-	Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].Render(document.getElementById('search_buttons[<inp2:m_param name="PrefixSpecial"/>]'));
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'] = new ToolBar('icon16_');
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].UseLabels = false;
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
+			new ToolBarButton(
+						 'search',
+						 '<inp2:m_phrase name="la_ToolTip_Search" escape="1"/>',
+						 function() { search('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
+						 null,
+						 '<inp2:m_param name="PrefixSpecial"/>') );
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].AddButton(
+			new ToolBarButton(
+						 'search_reset',
+						 '<inp2:m_phrase name="la_ToolTip_SearchReset" escape="1"/>',
+						 function() { search_reset('<inp2:m_param name="PrefixSpecial"/>','<inp2:m_param name="grid"/>', <inp2:m_param name="ajax"/>) },
+						 null,
+						 '<inp2:m_param name="PrefixSpecial"/>') );
+		Toolbars['<inp2:m_param name="PrefixSpecial"/>_search'].Render(document.getElementById('search_buttons[<inp2:m_param name="PrefixSpecial"/>]'));
 </inp2:m_DefineElement>
 
 <inp2:m_block name="grid_column_title" use_phrases="1"/>