diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/BrowserPermissionHelper.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/BrowserPermissionHelper.mxml
index b81c105d01..d9c57814b3 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/BrowserPermissionHelper.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/BrowserPermissionHelper.mxml
@@ -42,7 +42,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	<mx:states>
 		<mx:State name="default"/>
 		<mx:State name="chromeMic"/>
+		<mx:State name="chromeMicMacOSX" basedOn="chromeMic"/>
 		<mx:State name="chromeCam"/>
+		<mx:State name="chromeCamMacOSX" basedOn="chromeCam"/>
 		<mx:State name="firefoxMic"/>
 		<mx:State name="firefoxMicMacOSX" basedOn="firefoxMic"/>
 	</mx:states>
@@ -80,8 +82,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 					 text.firefoxMic="{ResourceUtil.getInstance().getString('bbb.micPermissions.firefox.message')}"
 					 selectable="false"
 					 styleName="permissionSettingsTextStyle" />
-			<mx:Image source.chromeMic="@Embed('assets/chrome-permissions.png')" 
-					  source.chromeCam="@Embed('assets/chrome-permissions.png')" 
+			<mx:Image source.chromeMic="@Embed('assets/chrome-permissions-windows.png')" 
+					  source.chromeMicMacOSX="@Embed('assets/chrome-permissions-macosx.png')" 
+					  source.chromeCam="@Embed('assets/chrome-permissions-windows.png')" 
+					  source.chromeCamMacOSX="@Embed('assets/chrome-permissions-macosx.png')" 
 					  source.firefoxMic="@Embed('assets/firefox-permissions-windows.png')"
 					  source.firefoxMicMacOSX="@Embed('assets/firefox-permissions-macosx.png')"/>
 		</mx:HBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index 9c0ec042fa..7e146238ea 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -626,7 +626,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
                     }
                 } else if (BrowserCheck.isChrome()) {
                     if (browserPermissionHelper) {
-						browserPermissionHelper.currentState = "chromeMic";
+						if (Capabilities.os.indexOf("Mac") >= 0){
+							browserPermissionHelper.currentState = "chromeMicMacOSX";
+						} else {
+							browserPermissionHelper.currentState = "chromeMic";
+						}
 						browserPermissionHelper.x = 50;
 						browserPermissionHelper.y = 130;
                     }
@@ -647,7 +651,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private function showbrowserPermissionHelper() : void {
 				var browserPermissionHelper : BrowserPermissionHelper = PopUpUtil.createNonModalPopUp(FlexGlobals.topLevelApplication as DisplayObject, BrowserPermissionHelper, false) as BrowserPermissionHelper;
 				if (browserPermissionHelper) {
-					browserPermissionHelper.currentState = "chromeCam";
+					if (Capabilities.os.indexOf("Mac") >= 0){
+						browserPermissionHelper.currentState = "chromeCamMacOSX";
+					} else {
+						browserPermissionHelper.currentState = "chromeCam";
+					}
 					browserPermissionHelper.x = 20;
 					browserPermissionHelper.y = 150;
 				}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/VideoWithWarnings.as b/bigbluebutton-client/src/org/bigbluebutton/main/views/VideoWithWarnings.as
index d8bfb4b94f..0129920432 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/VideoWithWarnings.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/VideoWithWarnings.as
@@ -39,11 +39,11 @@ package org.bigbluebutton.main.views
 
         public function VideoWithWarnings() {
             super();
-
-            this.addEventListener(FlexEvent.CREATION_COMPLETE , creationCompleteHandler);
         }
 
-        private function creationCompleteHandler(e:FlexEvent):void {
+        override protected function creationCompleteHandler(e:FlexEvent):void {
+			super.creationCompleteHandler(e);
+
             _video.smoothing = true;
             _videoHolder.addChild(_video);
 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/VideoWithWarningsBase.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/VideoWithWarningsBase.mxml
index 0e73cd9802..f6fa5b9d03 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/VideoWithWarningsBase.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/VideoWithWarningsBase.mxml
@@ -21,13 +21,34 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <mx:VBox xmlns:mx="library://ns.adobe.com/flex/mx" 
 		 xmlns:fx="http://ns.adobe.com/mxml/2009"
 		 xmlns:mate="http://mate.asfusion.com/" width="100%" height="100%"
+		 creationComplete="creationCompleteHandler(event)"
          horizontalAlign="center" >
+	<fx:Script>
+		<![CDATA[
+			import mx.events.FlexEvent;
+			
+			protected function creationCompleteHandler(event:FlexEvent):void
+			{
+				if (Capabilities.os.indexOf("Mac") >= 0){
+					this.currentState = "chromeMacOSX";
+				} else {
+					this.currentState = "chrome";
+				}
+			}
+			
+		]]>
+	</fx:Script>
 
 	<fx:Declarations>
 	    <mx:Fade id="dissolveOut" duration="1000" alphaFrom="1.0" alphaTo="0.0"/>
 	    <mx:Fade id="dissolveIn" duration="1000" alphaFrom="0.0" alphaTo="1.0"/>
 	</fx:Declarations>
 
+	<mx:states>
+		<mx:State name="chrome"/>
+		<mx:State name="chromeMacOSX" basedOn="chrome"/>
+	</mx:states>
+
     <mx:Canvas
             id="videoCanvas"
             width="100%"
@@ -42,7 +63,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
                 y="60"
                 x="{this.width/2 - imgChromeHelp.width/2}"
                 visible="false"
-                source="@Embed('assets/chrome-permissions.png')" />
+                source.chrome="@Embed('assets/chrome-permissions-windows.png')"
+				source.chromeMacOSX="@Embed('assets/chrome-permissions-macosx.png')"/>
         <mx:VBox
                 width="100%"
                 height="100%"
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-permissions.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-permissions-macosx.png
similarity index 100%
rename from bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-permissions.png
rename to bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-permissions-macosx.png
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-permissions-windows.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-permissions-windows.png
new file mode 100644
index 0000000000..df4f604136
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-permissions-windows.png differ