Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
diff -u -r09139a18612e0af686ddc05190832a1e05d67398 -r35d182812770922955a51ce25d364fb2b0d8d033
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 09139a18612e0af686ddc05190832a1e05d67398)
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 35d182812770922955a51ce25d364fb2b0d8d033)
@@ -58,12 +58,6 @@
 			
 			[Embed("assets/icons/transition.png")]
             public var transitionCursor:Class;
-            
-            [Embed("assets/icons/zoom_in.png")]
-            public var zoomInCursor:Class;
-            
-            [Embed("assets/icons/zoom_out.png")]
-            public var zoomOutCursor:Class;
 
 			public function changeCursorState(state:int):void{
 				cursorState = state;
@@ -74,12 +68,6 @@
 					case Constants.CURSOR_STATE_TRANSITION:
 						CursorManager.setCursor(transitionCursor);
 						break;
-					case Constants.CURSOR_STATE_ZOOM_IN:
-						CursorManager.setCursor(zoomInCursor);
-						break;
-					case Constants.CURSOR_STATE_ZOOM_OUT:
-						CursorManager.setCursor(zoomOutCursor);
-						break;
 				}
 			
 			
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u -r09139a18612e0af686ddc05190832a1e05d67398 -r35d182812770922955a51ce25d364fb2b0d8d033
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 09139a18612e0af686ddc05190832a1e05d67398)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 35d182812770922955a51ce25d364fb2b0d8d033)
@@ -78,29 +78,8 @@
                 // Return cursor state to normal
 				Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);                    
             }
-            
-            
-            
-            
-            
-            
-            /* private function doZoom(component:UIComponent,val:Number):void
-			{
-				component.scaleX = val;
-				component.scaleY = val;
-				
-				if(component is Container)
-				{
-					var children:Array = Container(component).getChildren();
-					for(var i:int = 0; i < children.length; i++)
-					{
-						doZoom(children[i], val);
-					}
-				}
-			} */ 
 			
-			
-			private function doZoom(event:MouseEvent):void
+			public function doZoom(isOut:Boolean):void
 			{
 				var zoom:Zoom = new Zoom();
 				
@@ -111,13 +90,13 @@
 				zoom.zoomHeightFrom = currentZoom;
 				zoom.zoomWidthFrom = currentZoom;
 				
-				if (Application.application.cursorState == Constants.CURSOR_STATE_ZOOM_IN && currentZoom < MAX_ZOOM) {
+				if (!isOut && currentZoom < MAX_ZOOM) {
 					zoom.zoomHeightTo = currentZoom + ZOOM_LEVEL;
 					zoom.zoomWidthTo = currentZoom + ZOOM_LEVEL;
 					currentZoom += 0.2;
 					currentZoom = Math.round(currentZoom * 10)/10;
 					zoom.play([this], false);
-				} else if (Application.application.cursorState == Constants.CURSOR_STATE_ZOOM_OUT && currentZoom > MIN_ZOOM) {
+				} else if (isOut && currentZoom > MIN_ZOOM) {
 					zoom.zoomHeightTo = currentZoom - ZOOM_LEVEL;
 					zoom.zoomWidthTo = currentZoom - ZOOM_LEVEL;
 					currentZoom -= 0.2;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml
===================================================================
diff -u -r09139a18612e0af686ddc05190832a1e05d67398 -r35d182812770922955a51ce25d364fb2b0d8d033
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml	(.../ToolBar.mxml)	(revision 09139a18612e0af686ddc05190832a1e05d67398)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml	(.../ToolBar.mxml)	(revision 35d182812770922955a51ce25d364fb2b0d8d033)
@@ -32,6 +32,14 @@
 				
 			}
 			
+			public function doZoom(isOut:Boolean):void {
+				var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+				
+				canvasBox.doZoom(isOut);
+				
+				zoomInButton.enabled = canvasBox.currentZoom < canvasBox.MAX_ZOOM; 
+				zoomOutButton.enabled = canvasBox.currentZoom > canvasBox.MIN_ZOOM;
+			}
 			
 		]]>
 	</mx:Script>
@@ -64,8 +72,8 @@
 	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/save.png')" toolTip="Save"></mx:Button>
 	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/copy.png')" toolTip="Copy Activity"></mx:Button>
 	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/paste.png')" toolTip="Paste Activity"></mx:Button>
-	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/zoom_in.png')" toolTip="Zoom In" click="Application.application.changeCursorState(Constants.CURSOR_STATE_ZOOM_IN)"></mx:Button>
-	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/zoom_out.png')" toolTip="Zoom Out" click="Application.application.changeCursorState(Constants.CURSOR_STATE_ZOOM_OUT)"></mx:Button>
+	    <mx:Button id="zoomInButton" height="25" width="27" icon="@Embed(source='assets/icons/zoom_in.png')" toolTip="Zoom In" click="doZoom(false)" enabled="false"></mx:Button>
+	    <mx:Button id="zoomOutButton" height="25" width="27" icon="@Embed(source='assets/icons/zoom_out.png')" toolTip="Zoom Out" click="doZoom(true)"></mx:Button>
 	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/cursor.png')" toolTip="Normal Cursor" click="Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL)"></mx:Button>
 	    <mx:Spacer width="5"></mx:Spacer>
 	    <mx:Button height="25" icon="@Embed(source='assets/icons/transition.png')" label="Transition" click="Application.application.changeCursorState(Constants.CURSOR_STATE_TRANSITION)"></mx:Button>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
===================================================================
diff -u -r09139a18612e0af686ddc05190832a1e05d67398 -r35d182812770922955a51ce25d364fb2b0d8d033
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision 09139a18612e0af686ddc05190832a1e05d67398)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision 35d182812770922955a51ce25d364fb2b0d8d033)
@@ -17,8 +17,6 @@
 	    public static const CURSOR_STATE_TRANSITION:int = 2;
 	    public static const CURSOR_STATE_DATAFLOW:int = 3;
 	    public static const CURSOR_STATE_HELP:int = 4;
-	    public static const CURSOR_STATE_ZOOM_IN:int = 5;
-	    public static const CURSOR_STATE_ZOOM_OUT:int = 6;
 	    
 	    public static const UI_STATE_NORMAL:int = 1;
 	    public static const UI_STATE_DRAWING:int = 2;