Index: branches/5.1.x/admin_templates/products/relations_edit.tpl
===================================================================
diff -u -r13946 -r14152
--- branches/5.1.x/admin_templates/products/relations_edit.tpl	(.../relations_edit.tpl)	(revision 13946)
+++ branches/5.1.x/admin_templates/products/relations_edit.tpl	(.../relations_edit.tpl)	(revision 14152)
@@ -17,15 +17,24 @@
 						}
 				 ) );
 
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+					go_to_id('rel', '<inp2:rel_PrevId/>');
+				}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('rel', '<inp2:rel_NextId/>');
+					}
+				));
+
 				a_toolbar.Render();
 
 				<inp2:m_if check="rel_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-					a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="rel_IsLast" >
 						a_toolbar.DisableButton('next');
Index: branches/5.1.x/admin_templates/products/file_edit.tpl
===================================================================
diff -u -r13946 -r14152
--- branches/5.1.x/admin_templates/products/file_edit.tpl	(.../file_edit.tpl)	(revision 13946)
+++ branches/5.1.x/admin_templates/products/file_edit.tpl	(.../file_edit.tpl)	(revision 14152)
@@ -17,7 +17,32 @@
 						}
 				 ) );
 
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						go_to_id('file', '<inp2:file_PrevId/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('file', '<inp2:file_NextId/>');
+					}
+				));
+
 				a_toolbar.Render();
+
+				<inp2:m_if check="file_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="file_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="file_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>				
 			</script>
 		</td>
 	</tr>
Index: branches/5.1.x/admin_templates/products/access_pricing_edit.tpl
===================================================================
diff -u -r13946 -r14152
--- branches/5.1.x/admin_templates/products/access_pricing_edit.tpl	(.../access_pricing_edit.tpl)	(revision 13946)
+++ branches/5.1.x/admin_templates/products/access_pricing_edit.tpl	(.../access_pricing_edit.tpl)	(revision 14152)
@@ -17,7 +17,32 @@
 						}
 				 ) );
 
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						go_to_id('pr', '<inp2:pr_PrevId/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('pr', '<inp2:pr_NextId/>');
+					}
+				));
+
 				a_toolbar.Render();
+				
+				<inp2:m_if check="pr_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="pr_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="pr_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
Index: branches/5.1.x/admin_templates/products/images_edit.tpl
===================================================================
diff -u -r13946 -r14152
--- branches/5.1.x/admin_templates/products/images_edit.tpl	(.../images_edit.tpl)	(revision 13946)
+++ branches/5.1.x/admin_templates/products/images_edit.tpl	(.../images_edit.tpl)	(revision 14152)
@@ -19,15 +19,24 @@
 						}
 				 ) );
 
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						go_to_id('img', '<inp2:img_PrevId/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('img', '<inp2:img_NextId/>');
+					}
+				));
+
 				a_toolbar.Render();
 
 				<inp2:m_if check="img_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-					a_toolbar.HideButton('sep2');
+					a_toolbar.HideButton('sep1');					
 				<inp2:m_else/>
 					<inp2:m_if check="img_IsLast" >
 						a_toolbar.DisableButton('next');
Index: branches/5.1.x/admin_templates/products/review_edit.tpl
===================================================================
diff -u -r13946 -r14152
--- branches/5.1.x/admin_templates/products/review_edit.tpl	(.../review_edit.tpl)	(revision 13946)
+++ branches/5.1.x/admin_templates/products/review_edit.tpl	(.../review_edit.tpl)	(revision 14152)
@@ -17,6 +17,18 @@
 						}
 				 ) );
 
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						go_to_id('rev', '<inp2:rev_PrevId/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('rev', '<inp2:rev_NextId/>');
+					}
+				));
+
 				a_toolbar.Render();
 
 				<inp2:m_if check="rev_IsSingle" >
Index: branches/5.1.x/admin_templates/products/option_edit.tpl
===================================================================
diff -u -r13946 -r14152
--- branches/5.1.x/admin_templates/products/option_edit.tpl	(.../option_edit.tpl)	(revision 13946)
+++ branches/5.1.x/admin_templates/products/option_edit.tpl	(.../option_edit.tpl)	(revision 14152)
@@ -20,7 +20,35 @@
 						}
 				 ) );
 
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						PrepareData();
+						go_to_id('po', '<inp2:po_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						PrepareData();
+						go_to_id('po', '<inp2:po_NextId/>');
+					}
+				));
+	
 				a_toolbar.Render();
+
+				<inp2:m_if check="po_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');					
+				<inp2:m_else/>
+					<inp2:m_if check="po_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="po_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+				
 			</script>
 		</td>
 	</tr>
Index: branches/5.1.x/admin_templates/shipping/zone_edit.tpl
===================================================================
diff -u -r13946 -r14152
--- branches/5.1.x/admin_templates/shipping/zone_edit.tpl	(.../zone_edit.tpl)	(revision 13946)
+++ branches/5.1.x/admin_templates/shipping/zone_edit.tpl	(.../zone_edit.tpl)	(revision 14152)
@@ -32,15 +32,12 @@
 						}
 				 ) );
 
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
 				a_toolbar.Render();
 
 				<inp2:m_if check="z_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
-					a_toolbar.HideButton('sep2');
 				<inp2:m_else/>
 					<inp2:m_if check="z_IsLast" >
 						a_toolbar.DisableButton('next');