diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
index 5bacacf6de..4648b96f18 100644
--- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
+++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
@@ -164,12 +164,13 @@ namespace SharpReportSamples
 			
 			this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
 			{
-				this.RunContributors(fileName);
+				this.previewControl1.RunReport(model,dataManager);
 			};
 			
 			this.previewControl1.RunReport(model,dataManager);
 		}
 		
+		
 		//Try this to react to SectionrenderEvent,
 		/*
 		private void PushPrinting (object sender,SectionRenderEventArgs e)
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
index d0468a4e35..13cec3f4ec 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
@@ -334,6 +334,10 @@
     <EmbeddedResource Include="Project\ReportViewer\Resources\MakePdf.bmp" />
     <EmbeddedResource Include="Project\Resources\CoreResource.resx" />
     <None Include="Project\Expressions\SimpleExpressionEvaluator\Parser\SimpleExpressionLanguage.tpg" />
+    <None Include="Project\ReportViewer\Resources\Icons\Back.bmp" />
+    <None Include="Project\ReportViewer\Resources\Icons\First.bmp" />
+    <None Include="Project\ReportViewer\Resources\Icons\Last.bmp" />
+    <None Include="Project\ReportViewer\Resources\Icons\Next.bmp" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Project\BaseClasses\Printing" />
@@ -363,6 +367,7 @@
     <Folder Include="Project\Interfaces" />
     <Folder Include="Project\DataSource" />
     <Folder Include="Project\Expressions" />
+    <Folder Include="Project\ReportViewer\Resources\Icons" />
     <Folder Include="Project\Resources" />
     <Folder Include="Project\Printing" />
     <Folder Include="Project\Printing\Graphics" />
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs
index 7d7d0b0b73..f0e3e32fc9 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs
@@ -307,6 +307,9 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 				updateControl = ShowCompleted;
 				Invoke (updateControl);
 			}
+			if (this.dataManager != null) {
+				this.dataManager.GetNavigator.Reset();
+			}
 			this.SetPages();
 			this.CheckEnable();
 			this.cancelButton.Enabled = false;
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx
index e9d591af1d..051c5b8804 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx
@@ -127,51 +127,68 @@
   <data name="firstPageButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABgSURBVDhPpZPbEgAQCET7dH8eZmSSiG0aL9hjdSHiZCTl
-        TAuAStto6xb2/AvgPfAMEDHkYIp5/2LowIq/HHhiDDCqAyVRJw8C9J6wEN0nYRLlcqqMFgI50JAjAJnM
-        7DRWL7zezyXVlqkAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKDSURBVDhPddJbSNNRHMBxe62HoOihh6woUCvSiaGoeb9k
+        KWIpKkoXDE2ENKFIJALrQXrQCE1Zxiopnbm08rLUvCyvWCZphotZ2dycc07b8l7f/moKf9QDPw7n/M75
+        cM75HRv+t2PPjSQ2m7nQOElkrWl1esO+1zDHufqJ5ZzN6oo4pYkxYdAyB5E145sCOssiXnI9AQqDGDit
+        GOWhgCarFwkq020IDBhm8SkepncWoir0YiC8ZITHAnB5cJ7AYu06oOv7b7wfaOj8BZlfF5DkD4mB0EfD
+        FAinSuibw69oJbna2jUWQorU1BgXSP44Q2SnFfe7g2LghFRDru4v8T0zeBVq1jaXthsIlw7SYoXYDgsn
+        683EtFlwzf4sBgLz1GT/WCSi3crxeyv6k4ZhTuX1o5yCsKZJ/KpNhAqvH6aawiWrVwz45wxwQz1PUPMU
+        ofmDyJTfSJRrkI0u4q2cwOOVEf/qcXyF8H9jxjmjWwz4ZPeS/mUez9pJgnP68bvSSEaDjjM98xwqNeBR
+        acTtxRiuQvncq0wcTW8VAx5Z3SR9mkFSOYHnrZ7lZNxNFaGF/QSrrDgU65E80+MohKTcxOGUJjHgltlB
+        fPc09iVjOF5tW3vES7ffEZL7Ht+3VmylP7Ev0mL3VI/DRaUYcLmmIqJ1mr0yPUdSW0RlLCjrx+16E17C
+        9Xbe17JHqsX+/Gsx4JTWSFCDhV35WhyS6tZ9JHmNGudUJY4KI9vzdeyPVogB+xQlrlVmtt0Z4mBCzYZf
+        ue3DCAfiy3F8acY2ulwM2KXV4aT6g03OKPvOVm8ILE0OaEzsjipjZ5BMDGwNkLEjtpItIaXYxcg3BZYS
+        XX16vJIqltf8A0jvUCl10jfWAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="backButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPrZJdSFNhHMaXaEvNmh+1cAumU7EPza2y0FVH
-        UrSbILsovJBFfpBBHfqYFNIRi0jSjRmmFLHKkRepNXObKe5NLZWsDiRqmeMYStbVoejjwounzpk7uBZe
-        9cIf3ov3+T3P/+GVyf734X5xGuYDU02NUITq9w39mraQeUIt68WDV9CTtOXAaD6sU1fwYLoO1rEKMKMH
-        cYykIdOhRJ4zh7Bf2IwgkCDeM2xgqycr0T7TjOZJE66+KcLZF1k4OZAuTXFfKlJuK/kgiOB8eeI87k7V
-        wPy2DBdGcmGfYvBz4RvavLUBkBKyBZtuaDme5xViEmFng0eHxvEzqHlVCPr5TrS8r4L/eObsAYCKgTTs
-        bY2HZdBCiwBmnKkuHcqFaXif+HCpePb7O5wbypYAZf1bUUSSccSjRfZNPSsCcp5S5NTg9iCxkEBwd35s
-        Escx04g2rgGH+hKQ16NGLCOHD9BNEcH50ssCKfZyl9weFbK6lVDVRywCHD7A3/F/LHwVHYVp8Zpx31uP
-        O9PXscMdh22uaCgqw3wA+hltKe5Nlfa8t6RA8qkN+b1q7O+Jx+7udchwxWCzcy02dkYg6WIiJwLILKF2
-        2ZUiwF9S44RJ2uLhzC3oXLFI/+Oa8CQS6s5wxDSFwWg22qQPVWDPIYfdWhz1JEklXRs7LUI8n51I6Voj
-        um5wyBHVEYK4cgXPzXMaCcDxnEZbq+TzXGr4SxLiFg4akOaOh6pzFaIfhSK8XYawchlsbpsx6Duzc2xG
-        Zp2eTWxeLZaU3BUlxl3/eCUiO1ZAbpUhrlTB/1O8lGbrtxn1VTo2/EQI5CUhCC2WQXtcw9ENtCUg9qLo
-        N+ba8EiDd2TRAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJOSURBVDhPnZJbSFRRFIZPF3KcRIuudsHmwSCEKKNEIiEq
+        AgMx0gepKCtJjXL0xUESQ6nMHsJMBK0mCYPMNLB8SCorupBhmpVmkjlqkzZnztycmTOaX3uQkIhE3bCf
+        9v9/a/1rL4lJTkCBwvx8eTIJ0v9e52bKbLxhJbx0BgApQyax2o6xz8fKS9MESHor8TV27L/GKPmoMscw
+        NPUIkkHhQL2Dfu8YT8yjnG7zsuO2k6hKu4hjI6JcIbxYRldoQVdkIeRYz8QMpFw7qY3D/PTB3d4R9C0q
+        +rdeGswjPB7yccekcvWrl6JON3kf3MQ9dxN45PM4YNY5J/qnw1j8ZtMouW0qOe+8pL72kP7CTfIzF/sa
+        ney+72BbrY3IKoU1RhuBh7uQgksdnBdiiwo1vaMUiNx5771kNXs4KswJj1zsfOBka52DyFs21hoVVouf
+        WV5mQ5P0CWlxmZOKbpVWZYzCDh8F7SrZApgmqu8XXe1tdLGrwUG0GOyGKgG4ZmXVFZklxQrzElrHIwQV
+        2sl86cYoOsgR2U++8ZAsMiY2uYl96Cam3sWmaifrbtoJK7ex7LJCyEUrs+NaJoaozbNySFQ72+kj5ZWH
+        JL+5TmZ79RCbq8xEXP+BrsRM6IV+Fuab0Ob2Ie1p/nsTA7NlYmsVMlpVEpo8RJX1oDN0EJ7/jTBDN6Hi
+        Lsr6QsiJLrSpXWji2/9dZU3GINGVVg42e9lSMUiwvnvqi/RHGZBmZn25TMw9GwtOmaYP8Du0x7+z4swA
+        Sw0DMwP4XZqUAYLS+ycF/Ab5DFsUNAKGgAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="forwardButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJeSURBVDhPtZJfSFNhGMbXcK1p1qzRoi2Yzon90XSVgVmd
-        gcO6CSqiEhqr/EMGcTCaFMGGRSWYa/3boIt1IdZFWltuM8WdppWBrYPVXJh1Kg0JggMaddHF0863PDRW
-        0U0vvHDge5/f83zv+SSS/1HcN05nf213UE8ohookm47STmaKof7qx4NX0nHauW24Cq6xM+gYb4XrRQPs
-        w9txgClCmU8Nc8DEsJ/YkjSQIN40VME64k3ofOeBJ27D2WfVOPaoHEcGisW29Bei4LqaT4MIzqdHj+PG
-        WDPanteJgsB7dwpAgNUwq7Disp7jeV5Jkgh3rgiX4mqsEc1Pd4J+uJ6IRj6HIdTEl1cpkIaBImy+uQzO
-        QSdNAPaY3VH7uBK2oS0pg+eiu/H1+3QKpC6yGtWMAXvCemy8ZmQJwHSfYo4Ork2LKqS4/aaFAIT6MBMn
-        Mzv6c2Hu1WKxXY4koIdihIOLIwfF4T99vJ2JobJXg/IeNTQXMn8CfP8OCH68hXUhFdYEc6BskiUB9APa
-        aekrFK9Q1aeF0PvCBrhHbWIY32QHEa8MLMRyfybyT+ZxBMBMMNSGdjUBzC5JAFxJ/NbZEsTFCdfce1nQ
-        +hVY5JbB2mb1ig9qa7uJ2RXSY284X1zS+PRLohfEBd0LiOtSnxzZXVKo6pU8N8XpRADHczp9i5o3B7Xi
-        khqj+3E+doK4avzzkHMnA4pOCWT1EnhDXmvac2Yn2ZKyViOb55lPlmToziZxl9ydi6yuOZC7JFDVKvnf
-        in+leSNeq/FUKas4LIW8RooMiwT6QzqOvkQ7U2InRD8A1b7v3f9G3ZAAAAAASUVORK5CYII=
+        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
 </value>
   </data>
   <data name="lastPageButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        Qk32AAAAAAAAAHYAAAAoAAAAEAAAABAAAAABAAQAAAAAAAAAAADEDgAAxA4AABAAAAAQAAAAAAAA/wAA
-        gP8AgAD/AICA/4AAAP+AAID/gIAA/8DAwP+AgID/AAD//wD/AP8A/////wAA//8A/////wD//////6qq
-        qqqqqqqqqqqqqqqqqqqqpKqqqqRKqqqkSqqqpEqqqqREqqqkSqqqpERKqqRKqqqkRESqpEqqqqREREqk
-        SqqqpETESqRKqqqkTESqpEqqqqTESqqkSqqqpESqqqRKqqqkSqqqpEqqqqSqqqqkSqqqqqqqqqqqqqqq
-        qqqqqqqq
+        Qk02AwAAAAAAADYAAAAoAAAAEAAAABAAAAABABgAAAAAAAAAAADEDgAAxA4AAAAAAAAAAAAA////7rtf
+        +enQ////////////////////////////7bdU8L5h78Bm66s1////////////6a1E56k+/PPm////////
+        ////////////////7LZU//nB///q7bhb////////////569V//jQ4qNA+OnW////////////////////
+        5qpG/Npp/+6d6K1S////////////3pUx+9t7//LI3Zs/9eDJ////////////////5KNF+tlu/+6h5adP
+        ////////////2ZA69MhU989p++u22pxJ893G////////////3pxC+dNj/+mX4qBM////////////1Yg3
+        88VY77tK88dZ//TB2ZpP6cao////////3Zg+985c/uaP3ZpI////////////0II08cJN7rtM7bVC8L9N
+        //G41JRL4ryi////2ZI99MZR/OGI2pRF////////////y3ky77lD7LVB7LVD67I77rg//Oif3alm37if
+        2ZVM8cBG+tp91o5D////////////xHIu7bQ66a036q4467A76agq+s5T5rx5vnFC1I5H8Lc8+tdy0IhA
+        ////////////v2sr7awx56Yv56Yx56Mp9MJH1JhMwn9b////zoM87rAx99Jny4I7////////////uGQp
+        56Un5Jwo45oe9L1BzI9Jw4Ro////////xXUv6qco9stcx3s4////////////s2Ao5Jod5JYT8Lc+v3g4
+        1KqX////////////wW8s558f9sRRwnY0////////////rVch5pUP660vuG8y2rap////////////////
+        umcp5JUV87xGvnAw////////////rFce77EvrFwj5c3F////////////////////tmMk3ooL77Q3uGso
+        ////////////n0YTqlUZ7d3W////////////////////////tV4g6I4A/cIwunAn////////////r2c+
+        59PJ////////////////////////////qVgnqEkBsFkSn0QK////////
 </value>
   </data>
   <data name="cancelButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/Back.bmp b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/Back.bmp
new file mode 100644
index 0000000000..f9504f1943
Binary files /dev/null and b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/Back.bmp differ
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/First.bmp b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/First.bmp
new file mode 100644
index 0000000000..cd5d1b01e5
Binary files /dev/null and b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/First.bmp differ
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/Last.bmp b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/Last.bmp
new file mode 100644
index 0000000000..4e5e38bcb4
Binary files /dev/null and b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/Last.bmp differ
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/Next.bmp b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/Next.bmp
new file mode 100644
index 0000000000..75866a14ab
Binary files /dev/null and b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/Resources/Icons/Next.bmp differ