Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as
===================================================================
diff -u -rbeff3f66caa1b691997d34c82f38fe7c4a20ba99 -rf9556a152589f80f1e35a1db2e8aa9f0794b0519
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision beff3f66caa1b691997d34c82f38fe7c4a20ba99)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision f9556a152589f80f1e35a1db2e8aa9f0794b0519)
@@ -460,6 +460,7 @@
 			//Property Inspector
 			_pi_mc.setSize(w-_toolkit.width,_pi_mc._height)
 			_pi_mc._y = h - _canvas.model.getPIHeight();
+			_pi_mc.showExpand(false);
 			
 			//var pi = _canvas.getPropertyInspector();
 			//pi._y = h;//- pi._height;
@@ -481,6 +482,11 @@
 		//Property Inspector
 		_pi_mc.setSize(w-_toolkit.width,_pi_mc._height)
 		_pi_mc._y = h - _canvas.model.getPIHeight();
+		var piHeight:Number = _canvas.model.getPIHeight();
+		_pi_mc.showExpand(false)
+		if (piHeight != _pi_mc.piFullHeight()){
+			_pi_mc.showExpand(true);
+		}
 		
 		//var pi = _canvas.getPropertyInspector();
 		//pi._y = h;//- pi._height;
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r74780cd8a3c745e0d24524acbe20b605a5e0ae3a -rf9556a152589f80f1e35a1db2e8aa9f0794b0519
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 74780cd8a3c745e0d24524acbe20b605a5e0ae3a)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision f9556a152589f80f1e35a1db2e8aa9f0794b0519)
@@ -250,10 +250,12 @@
 			if(ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SYNCH_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SCHEDULE_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PERMISSION_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
 				if (!_pi.isPIExpanded()){
 					_canvasModel.setPIHeight(_pi.piFullHeight());
+					//_pi.showExpand(false);
 				}
 			}else if (ca.activity.parentUIID != null && parentAct.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE && (ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE)){
 				if (!_pi.isPIExpanded()){
 					_canvasModel.setPIHeight(_pi.piFullHeight());
+					
 				}
 			}else{
 				Debugger.log('activityDoubleClick CanvasActivity:'+ca.activity.activityUIID,Debugger.CRITICAL,'activityDoubleClick to open Content','CanvasController');
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorNew.as
===================================================================
diff -u -rfe90ceb8b2f074bcdd8947ca255f84cfd9252827 -rf9556a152589f80f1e35a1db2e8aa9f0794b0519
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorNew.as	(.../PropertyInspectorNew.as)	(revision fe90ceb8b2f074bcdd8947ca255f84cfd9252827)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorNew.as	(.../PropertyInspectorNew.as)	(revision f9556a152589f80f1e35a1db2e8aa9f0794b0519)
@@ -52,6 +52,8 @@
 	private var clickTarget_mc:MovieClip;
 	private var _depth:Number;
 	private var delimitLine:MovieClip;
+	private var expand_mc:MovieClip;
+	private var collapse:MovieClip;
 	
 	//Properties tab
     private var title_lbl:Label;
@@ -300,11 +302,13 @@
 			trace("P Pressed in 'localOnRelease' and _piIsExpended is: "+_piIsExpended)
 			_piIsExpended = false
 			_canvasModel.setPIHeight(piHeightHide);
+			showExpand(true);
 			
 		}else {
 			trace("P Pressed in 'localOnRelease' and _piIsExpended is: "+_piIsExpended)
 			_piIsExpended = true
 			_canvasModel.setPIHeight(piHeightFull);
+			showExpand(false);
 			//Application.getInstance().onResize();
 		}
 	}
@@ -318,6 +322,13 @@
 	}
 	
 	
+	public function showExpand(e:Boolean){
+      
+        //show hide the icons
+		expand_mc._visible = e;
+                
+    }
+	
 	public function localOnReleaseOutside():Void{
 		Debugger.log('Release outside so no event has been fired, current state is: ' + _piIsExpended,Debugger.GEN,'localOnReleaseOutside','PropertyInspectorNew');
 		
@@ -963,6 +974,8 @@
         
     }
 	
+	
+	
 	/**
 	 * Get the CSSStyleDeclaration objects for each component and applies them
 	 * directly to the instanced