Index: branches/5.1.x/core/admin_templates/forms/form_field_edit.tpl
===================================================================
diff -u -N -r13949 -r14155
--- branches/5.1.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 13949)
+++ branches/5.1.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 14155)
@@ -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>