diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui
index 896bf811c..e19e198e6 100644
--- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui
+++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui
@@ -413,6 +413,15 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
          MinExtent = "1 1";
          bitmapAsset = "ToolsModule:separator_h_image";
       };
+      new GuiBitmapCtrl() {
+         Enabled = "1";
+         Profile = "ToolsGuiDefaultProfile";
+         position = "690 0";
+         Extent = "2 26";
+         MinExtent = "1 1";
+         bitmapAsset = "ToolsModule:separator_h_image";
+      };
+      
 	   new GuiControl(PaintBrushSlopeControlTE) {
          canSaveDynamicFields = "0";
          isContainer = "1";
@@ -420,7 +429,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
          HorizSizing = "right";
          VertSizing = "bottom";
          Position = "700 2";
-         Extent = "256 50";
+         Extent = "422 50";
          MinExtent = "8 2";
          canSave = "1";
          Visible = "1";
@@ -434,7 +443,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
             HorizSizing = "right";
             VertSizing = "bottom";
             Position = "21 5";
-            Extent = "78 10";
+            Extent = "74 10";
             MinExtent = "8 2";
             canSave = "1";
             Visible = "1";
@@ -447,7 +456,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
             AnchorBottom = "0";
             AnchorLeft = "1";
             AnchorRight = "0";
-            text = "Slope Mask: Min";
+            text = "Slope Range";
             maxLength = "1024";
          };
          new GuiTextEditCtrl() {
@@ -457,7 +466,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
             Profile = "ToolsGuiNumericDropSliderTextProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
-            Position = "104 2";
+            Position = "97 2";
             Extent = "51 18";
             MinExtent = "8 2";
             canSave = "1";
@@ -487,7 +496,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
             Profile = "ToolsGuiDefaultProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
-            Position = "137 2";
+            Position = "132 2";
             Extent = "18 18";
             MinExtent = "8 2";
             canSave = "1";
@@ -501,16 +510,6 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
             bitmapAsset = "ToolsModule:dropslider_n_image";
             Command = "Canvas.pushDialog(PaintBrushSlopeMinContainer);";
          };
-         new GuiTextCtrl() {
-            Profile = "ToolsGuiTextProfile";
-            HorizSizing = "right";
-            VertSizing = "bottom";
-            Position = "165 5";
-            Extent = "27 10";
-            MinExtent = "8 2";
-            text = "Max";
-            tooltip = "Max terrain angle that will be paintable";
-         };
          new GuiTextEditCtrl() {
             internalName = "SlopeMaxAngle";
             canSaveDynamicFields = "0";
@@ -518,7 +517,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
             Profile = "ToolsGuiNumericDropSliderTextProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
-            Position = "190 2";
+            Position = "150 2";
             Extent = "51 18";
             MinExtent = "8 2";
             canSave = "1";
@@ -548,7 +547,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
             Profile = "ToolsGuiDefaultProfile";
             HorizSizing = "right";
             VertSizing = "bottom";
-            Position = "223 2";
+            Position = "184 2";
             Extent = "18 18";
             MinExtent = "8 2";
             canSave = "1";
@@ -561,6 +560,140 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) {
             useMouseEvents = "0";
             bitmapAsset = "ToolsModule:dropslider_n_image";
             Command = "Canvas.pushDialog(PaintBrushSlopeMaxContainer);";
+         };         
+         new GuiBitmapCtrl() {
+            Enabled = "1";
+            Profile = "ToolsGuiDefaultProfile";
+            position = "211 0";
+            Extent = "2 26";
+            MinExtent = "1 1";
+            bitmapAsset = "ToolsModule:separator_h_image";
+         };
+         
+         new GuiTextCtrl() {
+            canSaveDynamicFields = "0";
+            isContainer = "0";
+            Profile = "ToolsGuiTextProfile";
+            HorizSizing = "right";
+            VertSizing = "bottom";
+            Position = "221 5";
+            Extent = "79 10";
+            MinExtent = "8 2";
+            canSave = "1";
+            Visible = "1";
+            tooltipprofile = "ToolsGuiToolTipProfile";
+            tooltip = "Allows painting on the terrain within a specified slope";
+            hovertime = "1000";
+            Margin = "0 0 0 0";
+            Padding = "0 0 0 0";
+            AnchorTop = "1";
+            AnchorBottom = "0";
+            AnchorLeft = "1";
+            AnchorRight = "0";
+            text = "Height Range";
+            maxLength = "1024";
+         };
+         new GuiTextEditCtrl() {
+            internalName = "tileMinHeight";
+            canSaveDynamicFields = "0";
+            isContainer = "0";
+            Profile = "ToolsGuiNumericDropSliderTextProfile";
+            HorizSizing = "right";
+            VertSizing = "bottom";
+            Position = "305 2";
+            Extent = "51 18";
+            MinExtent = "8 2";
+            canSave = "1";
+            Visible = "1";
+            validate = "TerrainPainterPlugin.validateTileMinHeight();";
+            Command = "ETerrainEditor.setTileLimitMinHeight( $ThisControl.getText() );";
+            tooltipprofile = "ToolsGuiToolTipProfile";
+            tooltip = "Minimum terrain angle that will be paintable";
+            hovertime = "1000";
+            Margin = "0 0 0 0";
+            Padding = "0 0 0 0";
+            AnchorTop = "1";
+            AnchorBottom = "0";
+            AnchorLeft = "1";
+            AnchorRight = "0";
+            text = "0.0";
+            maxLength = "4";
+            historySize = "0";
+            password = "0";
+            tabComplete = "0";
+            sinkAllKeyEvents = "0";
+            passwordMask = "*";
+         };
+         new GuiBitmapButtonCtrl() {
+            canSaveDynamicFields = "0";
+            isContainer = "0";
+            Profile = "ToolsGuiDefaultProfile";
+            HorizSizing = "right";
+            VertSizing = "bottom";
+            Position = "340 2";
+            Extent = "18 18";
+            MinExtent = "8 2";
+            canSave = "1";
+            Visible = "1";
+            tooltipprofile = "ToolsGuiToolTipProfile";
+            tooltip = "Minimum terrain angle that will be paintable";
+            hovertime = "1000";
+            groupNum = "-1";
+            buttonType = "PushButton";
+            useMouseEvents = "0";
+            bitmapAsset = "ToolsModule:dropslider_n_image";
+            Command = "Canvas.pushDialog(PaintBrushTileMinHeightContainer);";
+         };
+         new GuiTextEditCtrl() {
+            internalName = "tileMaxHeight";
+            canSaveDynamicFields = "0";
+            isContainer = "0";
+            Profile = "ToolsGuiNumericDropSliderTextProfile";
+            HorizSizing = "right";
+            VertSizing = "bottom";
+            Position = "358 2";
+            Extent = "51 18";
+            MinExtent = "8 2";
+            canSave = "1";
+            Visible = "1";
+            validate = "TerrainPainterPlugin.validateTileMaxHeight();";
+            Command = "ETerrainEditor.setTileLimitMaxHeight( $ThisControl.getText() );";
+            tooltipprofile = "ToolsGuiToolTipProfile";
+            tooltip = "Max terrain angle that will be paintable";
+            hovertime = "1000";
+            Margin = "0 0 0 0";
+            Padding = "0 0 0 0";
+            AnchorTop = "1";
+            AnchorBottom = "0";
+            AnchorLeft = "1";
+            AnchorRight = "0";
+            text = "90.0";
+            maxLength = "4";
+            historySize = "0";
+            password = "0";
+            tabComplete = "0";
+            sinkAllKeyEvents = "0";
+            passwordMask = "*";
+         };
+         new GuiBitmapButtonCtrl() {
+            canSaveDynamicFields = "0";
+            isContainer = "0";
+            Profile = "ToolsGuiDefaultProfile";
+            HorizSizing = "right";
+            VertSizing = "bottom";
+            Position = "392 2";
+            Extent = "18 18";
+            MinExtent = "8 2";
+            canSave = "1";
+            Visible = "1";
+            tooltipprofile = "ToolsGuiToolTipProfile";
+            hovertime = "1000";
+            groupNum = "-1";
+            tooltip = "Max terrain angle that will be paintable";
+            buttonType = "PushButton";
+            useMouseEvents = "0";
+            bitmapAsset = "ToolsModule:dropslider_n_image";
+            Command = "Canvas.pushDialog(PaintBrushTileMaxHeightContainer);";
          };
       };
       new GuiControl(TerrainSetHeightTextEditContainer) {
diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
index 0f6bdb2c4..d683ec178 100644
--- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
+++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
@@ -1435,14 +1435,14 @@ function TerrainPainterPlugin::validateTileMinHeight( %this )
 {
    %maxval = ETerrainEditor.getTileLimitMinHeight();
    PaintBrushSlopeControl-->tileMinHeight.setText(%maxval); 
-   //PaintBrushSlopeControlTE-->tileMinHeight.setText(%maxval); 
+   PaintBrushSlopeControlTE-->tileMinHeight.setText(%maxval); 
 }
 
 function TerrainPainterPlugin::validateTileMaxHeight( %this )
 {
    %minval = ETerrainEditor.getTileLimitMaxHeight();
    PaintBrushSlopeControl-->tileMaxHeight.setText(%minval); 
-   //PaintBrushSlopeControlTE-->tileMaxHeight.setText(%minval);  
+   PaintBrushSlopeControlTE-->tileMaxHeight.setText(%minval);  
 }
 
 function TerrainPainterPlugin::keyboardModifyBrushSize( %this, %amt)