Index: admin/system_presets/simple/categories_c.php
===================================================================
--- admin/system_presets/simple/categories_c.php	(revision 14094)
+++ admin/system_presets/simple/categories_c.php	(working copy)
@@ -35,7 +35,7 @@
 
 //		'categories_related_searches' => Array ('new_item', 'edit', 'delete', 'move_up', 'move_down', 'approve', 'decline', 'view', 'dbl-click'),
 
-//		'related_searches_edit' => Array ('select', 'cancel'),
+//		'related_searches_edit' => Array ('select', 'cancel', 'prev', 'next'),
 	);
 
 	// fields to hide
Index: admin/system_presets/simple/forms_form.php
===================================================================
--- admin/system_presets/simple/forms_form.php	(revision 14094)
+++ admin/system_presets/simple/forms_form.php	(working copy)
@@ -24,7 +24,7 @@
 //		'forms_edit_fields' => Array ('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'move_up', 'move_down', 'view', 'dbl-click'),
 
 //		edit form field when adding/editing form
-//		'form_field_edit' => Array ('select', 'cancel'),
+//		'form_field_edit' => Array ('select', 'cancel', 'prev', 'next'),
 	);
 
 	// fields to hide
Index: admin/system_presets/simple/users_u.php
===================================================================
--- admin/system_presets/simple/users_u.php	(revision 14094)
+++ admin/system_presets/simple/users_u.php	(working copy)
@@ -57,7 +57,7 @@
 //		'user_edit_group' => Array ('select', 'cancel'),
 
 //		user image adding/editing (used on "Images" tab during user adding/editing)
-//		'user_image_edit' => Array ('select', 'cancel'),
+//		'user_image_edit' => Array ('select', 'cancel', 'prev', 'next'),
 
 //		user selector
 //		'user_select' => Array ('select', 'cancel', 'view', 'dbl-click'),
Index: core/admin_templates/categories/images_edit.tpl
===================================================================
--- core/admin_templates/categories/images_edit.tpl	(revision 14094)
+++ core/admin_templates/categories/images_edit.tpl	(working copy)
@@ -20,7 +20,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('c-img', '<inp2:c-img_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('c-img', '<inp2:c-img_NextId/>');
+					}
+				));
+	
 				a_toolbar.Render();
+				
+				<inp2:m_if check="c-img_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="c-img_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="c-img_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
Index: core/admin_templates/categories/related_searches_edit.tpl
===================================================================
--- core/admin_templates/categories/related_searches_edit.tpl	(revision 14094)
+++ core/admin_templates/categories/related_searches_edit.tpl	(working copy)
@@ -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('c-search', '<inp2:c-search_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('c-search', '<inp2:c-search_NextId/>');
+					}
+				));
+	
 				a_toolbar.Render();
+				
+				<inp2:m_if check="c-search_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="c-search_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="c-search_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
Index: core/admin_templates/categories/relations_edit.tpl
===================================================================
--- core/admin_templates/categories/relations_edit.tpl	(revision 14094)
+++ core/admin_templates/categories/relations_edit.tpl	(working copy)
@@ -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('c-rel', '<inp2:c-rel_PrevId/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('c-rel', '<inp2:c-rel_NextId/>');
+					}
+				));
+
 				a_toolbar.Render();
 
 				<inp2:m_if check="c-rel_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="c-rel_IsLast" >
 						a_toolbar.DisableButton('next');
Index: core/admin_templates/forms/form_field_edit.tpl
===================================================================
--- core/admin_templates/forms/form_field_edit.tpl	(revision 14094)
+++ core/admin_templates/forms/form_field_edit.tpl	(working copy)
@@ -19,7 +19,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('formflds', '<inp2:formflds_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('formflds', '<inp2:formflds_NextId/>');
+					}
+				));
+
 				a_toolbar.Render();
+							
+				<inp2:m_if check="formflds_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="formflds_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="formflds_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
Index: core/admin_templates/regional/email_messages_edit.tpl
===================================================================
--- core/admin_templates/regional/email_messages_edit.tpl	(revision 14094)
+++ core/admin_templates/regional/email_messages_edit.tpl	(working copy)
@@ -20,8 +20,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('emailevents', '<inp2:emailevents_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('emailevents', '<inp2:emailevents_NextId/>');
+					}
+				));
+	
 				a_toolbar.Render();
-
+				
+				<inp2:m_if check="emailevents_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="emailevents_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="emailevents_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
Index: core/admin_templates/themes/file_edit.tpl
===================================================================
--- core/admin_templates/themes/file_edit.tpl	(revision 14094)
+++ core/admin_templates/themes/file_edit.tpl	(working copy)
@@ -25,7 +25,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('theme-file', '<inp2:theme-file_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('theme-file', '<inp2:theme-file_NextId/>');
+					}
+				));
+	
 				a_toolbar.Render();
+				
+				<inp2:m_if check="theme-file_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="theme-file_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="theme-file_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
Index: core/admin_templates/themes/themes_edit_files.tpl
===================================================================
--- core/admin_templates/themes/themes_edit_files.tpl	(revision 14094)
+++ core/admin_templates/themes/themes_edit_files.tpl	(working copy)
@@ -39,6 +39,7 @@
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
 						function() {
 							std_delete_items('theme-file')
Index: core/admin_templates/users/image_edit.tpl
===================================================================
--- core/admin_templates/users/image_edit.tpl	(revision 14094)
+++ core/admin_templates/users/image_edit.tpl	(working copy)
@@ -19,7 +19,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('u-img', '<inp2:u-img_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('u-img', '<inp2:u-img_NextId/>');
+					}
+				));
+	
 				a_toolbar.Render();
+				
+				<inp2:m_if check="u-img_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="u-img_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="u-img_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 	</tr>
Index: core/units/forms/forms/forms_config.php
===================================================================
--- core/units/forms/forms/forms_config.php	(revision 14094)
+++ core/units/forms/forms/forms_config.php	(working copy)
@@ -101,7 +101,7 @@
 									'edit_status_labels' => Array('formflds'=>'!la_title_Editing_FormField!'),
 									'new_titlefield' => Array('formflds'=>''),
 									'format' => "#form_status# '#form_titlefield#' - #formflds_status# '#formflds_titlefield#'",
-									'toolbar_buttons' => Array('select', 'cancel'),
+									'toolbar_buttons' => Array('select', 'cancel', 'prev', 'next'),
 								),
 
 						'tree_submissions' => Array (
Index: core/units/themes/themes_config.php
===================================================================
--- core/units/themes/themes_config.php	(revision 14094)
+++ core/units/themes/themes_config.php	(working copy)
@@ -68,7 +68,7 @@
 
 						'themes_edit_files' => Array(
 							'prefixes' => Array('theme', 'theme-file_List'), 'format' => "#theme_status# '#theme_titlefield#' - !la_title_ThemeFiles!",
-							'toolbar_buttons' => Array('select', 'cancel', 'prev', 'next', 'view', 'dbl-click'),
+							'toolbar_buttons' => Array('select', 'cancel', 'prev', 'next', 'edit', 'delete', 'view', 'dbl-click'),
 							),
 
 						'theme_file_edit' => Array (
@@ -77,7 +77,7 @@
 							'edit_status_labels' => Array ('theme-file' => '!la_title_EditingThemeFile!'),
 							'new_titlefield' => Array ('theme-file' => '!la_title_NewThemeFile!'),
 							'format' => "#theme_status# '#theme_titlefield#' - #theme-file_status# '#theme-file_titlefield#'",
-							'toolbar_buttons' => Array('select', 'cancel', 'reset_edit'),
+							'toolbar_buttons' => Array('select', 'cancel', 'reset_edit', 'prev', 'next'),
 						),
 
 						'block_edit' => Array('prefixes' => Array('theme-file'), 'format' => "!la_title_EditingThemeFile! '#theme-file_titlefield#'"),