diff --git a/bigbluebutton-client/branding/build.xml b/bigbluebutton-client/branding/build.xml
new file mode 100755
index 0000000000..a21544df39
--- /dev/null
+++ b/bigbluebutton-client/branding/build.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BigBlueButton Branding build.xml for use by Hudson builds.   -->
+<project name="BigBlueButton Branding" basedir=".." default="branding" >
+	<property environment="env" />
+	<property name="DEBUG" value="true" />
+	<property name="BUILD_ENV" value="DEV" />
+	<property name="FLEX_HOME" value="${env.FLEX_HOME}" />
+	<property name="themeFile" value="BBBDefault.css" />
+	<property name="BASE_DIR" value="${basedir}" />
+	<property name="SRC_DIR" value="${BASE_DIR}/src" />
+		
+	<property name="OUTPUT_DIR" value="${BASE_DIR}/bin" />
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
+	
+	<target name="init-ant-contrib">
+		<property name="ant-contrib.jar" location="${BASE_DIR}/build/lib/ant-contrib-0.6.jar"/>
+		<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${ant-contrib.jar}"/>
+	</target>
+	  	
+	<target name="branding" depends="init-ant-contrib">
+		<sequential>
+			<mxmlc file="${BASE_DIR}/branding/css/${themeFile}" 
+				output="${OUTPUT_DIR}/branding/css/${themeFile}.swf" 
+				debug="${DEBUG}" 
+				mxml.compatibility-version="3.0.0" 
+				swf-version="13" 
+				optimize="true">
+			</mxmlc>
+		</sequential>
+	</target>
+</project>
diff --git a/bigbluebutton-client/branding/css/BBBDefault.css b/bigbluebutton-client/branding/css/BBBDefault.css
new file mode 100755
index 0000000000..a7736df2a9
--- /dev/null
+++ b/bigbluebutton-client/branding/css/BBBDefault.css
@@ -0,0 +1,588 @@
+Application {
+  backgroundColor: #ffffff;
+}
+
+
+ApplicationControlBar {
+  highlightAlphas: 0.1, 0;
+  fillAlphas: 0, 0;
+  fillColors: #32343b, #32343b;
+  backgroundColor: #42444c;
+  backgroundAlpha: 1;
+  cornerRadius: 0;
+  dropShadowEnabled: true;
+  shadowDistance: 1;
+  shadowDirection: center;
+  dropShadowColor: #000000;
+}
+
+Panel {
+  borderColor: #dfdfdf;
+  borderAlpha: 1;
+  shadowDistance: 1;
+  dropShadowColor: #666666;
+  titleStyleName: "mypanelTitle";
+}
+
+.mypanelTitle {
+  color: #444444;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+.whiteboardToolbarStyle {
+  backgroundColor: #CCCCCC;
+  cornerRadius: 5;
+  borderStyle: solid;
+  borderThickness: 1;
+  paddingBottom: 3;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+}
+
+Button {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+DataGrid {
+  backgroundColor: #e1e2e5;
+  rollOverColor: #f3f3f3;
+  textRollOverColor: #5e5f63;
+  selectionColor: #e1e2e5;
+  color: #5e5f63;
+  textSelectedColor: #5e5f63;
+  dropShadowEnabled: false;
+  fontFamily: arial;
+  fontSize: 11;
+  headerStyleName: "mydataGridHeaderStyle";
+}
+
+.mydataGridHeaderStyle {
+  color: #5e5f63;
+  fontFamily: arial;
+  fontSize: 12;
+}
+
+
+.whiteboardUndoButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/undo.png');
+}
+
+.whiteboardCircleButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/ellipse.png');  
+}
+
+.whiteboardClearButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/trash.png');    
+}
+
+.whiteboardScribbleButtonStyle{
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/marker.png');  
+}
+
+.whiteboardLineButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/line.png');    
+}
+
+.whiteboardPanZoomButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/hand.png');   
+}
+
+.whiteboardRectangleButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/square.png');   
+}
+
+.whiteboardTextButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/text.png');   
+}
+
+.whiteboardTriangleButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/triangle.png');    
+}
+
+.presentationUploadButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/upload.png'); 
+}
+
+.presentationBackButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/left-arrow.png'); 
+}
+
+.presentationForwardButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/right-arrow.png'); 
+}
+
+.presentationFitToWidthButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/fit-to-width.png'); 
+}
+
+.presentationFitToPageButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/fit-to-screen.png'); 
+}
+
+.presentationZoomSliderStyle{
+  labelOffset: 0;
+  thumbOffset: 3;
+  dataTipOffset: -1;
+  tickOffset: 2;
+  tickLength: 5;
+  tickThickness: 2;
+  tickColor: #6cccff;
+  showTrackHighlight: true;
+  invertThumbDirection: false;
+  borderColor: #b9babc;
+  trackColors: #aaaaaa, #aaaaaa;
+  themeColor: #aaaaaa;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  labelStyleName: "presentationZoomSliderLabelStyle";
+}
+
+.presentationZoomSliderLabelStyle {
+  color: #5e5f63;
+  fontFamily: Arial;
+}
+
+MDIWindow {
+  resizeCursorHorizontalXOffset: 2;	
+}
+
+.mdiWindowFocus, .mdiWindowNoFocus, .presentationWindowStyleNoFocus, .presentationWindowStyleFocus, .videoDockStyleNoFocus, .videoDockStyleFocus
+{
+  headerHeight: 26;
+  roundedBottomCorners: false;
+  backgroundAlpha: 1;
+  backgroundColor: #b9babc;
+  backgroundSize: '100%';
+  
+  borderStyle: solid;
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThickness: 1;
+  borderThicknessLeft: 1;
+  borderThicknessTop: 1;
+  borderThicknessBottom: 1;
+  borderThicknessRight: 1;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+  
+  cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
+  cornerResizeWidth: 2;
+  cornerResizeHeight: 2;
+  cornerResizePaddingRight: 2;
+  cornerResizePaddingBottom: 2;
+  
+  controlButtonWidth: 10;
+  controlButtonHeight: 10;
+  controlButtonGap: 4;
+}
+
+.presentationSlideViewStyle {
+  backgroundColor: #b9babc;
+}
+
+.presentationWindowControlsStyle {
+  paddingBottom: 5;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+  bottom: 5;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+}
+
+.videoViewStyleNoFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoViewStyleFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoPublishStyleNoFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoPublishStyleFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoAvatarStyleNoFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoAvatarStyleFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.mypanelTitle {
+  color: #5e5f63;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+.closeBtnFocus
+{
+  upSkin:        Embed('assets/img/3_closeButton.png');
+  overSkin:      Embed('assets/img/3_closeButton.png');
+  downSkin:      Embed('assets/img/3_closeButton.png');
+  disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+.closeBtnNoFocus
+{
+  upSkin:        Embed('assets/img/3_closeButton.png');
+  overSkin:      Embed('assets/img/3_closeButton.png');
+  downSkin:      Embed('assets/img/3_closeButton.png');
+  disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+
+.increaseBtnFocus
+{
+  upSkin:        Embed('assets/img/3_increaseButton.png');
+  overSkin:      Embed('assets/img/3_increaseButton.png');
+  downSkin:      Embed('assets/img/3_increaseButton.png');
+  disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+.increaseBtnNoFocus
+{
+  upSkin:        Embed('assets/img/3_increaseButton.png');
+  overSkin:      Embed('assets/img/3_increaseButton.png');
+  downSkin:      Embed('assets/img/3_increaseButton.png');
+  disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+
+.decreaseBtnFocus 
+{
+  upSkin:        Embed('assets/img/3_decreaseButton.png');
+  overSkin:      Embed('assets/img/3_decreaseButton.png');
+  downSkin:      Embed('assets/img/3_decreaseButton.png');
+  disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+.decreaseBtnNoFocus 
+{
+  upSkin:        Embed('assets/img/3_decreaseButton.png');
+  overSkin:      Embed('assets/img/3_decreaseButton.png');
+  downSkin:      Embed('assets/img/3_decreaseButton.png');
+  disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+
+.minimizeBtnFocus 
+{
+  upSkin:        Embed('assets/img/3_minimizeButton.png');
+  overSkin:      Embed('assets/img/3_minimizeButton.png');
+  downSkin:      Embed('assets/img/3_minimizeButton.png');
+  disabledSkin:  Embed('assets/img/3_minimizeButton.png');
+}
+
+
+.resizeHndlr 
+{
+  upSkin:        Embed('assets/img/resizeHandler.png');
+  overSkin:      Embed('assets/img/resizeHandler.png');
+  downSkin:      Embed('assets/img/resizeHandler.png');
+  disabledSkin:  Embed('assets/img/resizeHandler.png');
+}
diff --git a/bigbluebutton-client/branding/css/Blue.css b/bigbluebutton-client/branding/css/Blue.css
new file mode 100755
index 0000000000..86a6b807a8
--- /dev/null
+++ b/bigbluebutton-client/branding/css/Blue.css
@@ -0,0 +1,173 @@
+Application 
+{  
+   backgroundColors: #000000,#3f3f3f;
+   backgroundImage: Embed(source="assets/img/bk3.jpg");
+   backgroundSize: "100%";
+   backgroundGradientColors: #B4BFCF, #78829C;
+   themeColor: #0094C7;
+   backgroundGradientAlphas: 0.62, 0.26;
+}
+
+
+MDICanvas 
+{
+	backgroundColor: #0094C7;
+	backgroundAlpha: 0;
+}
+
+
+Button 
+{
+   highlightAlphas: 1, 0.33;
+   fillAlphas: 1, 0.16, 0.18, 1;
+   fillColors: #5f89b9, #697182, #ffffff, #eeeeee;
+}
+
+
+.mdiWindowFocus 
+{
+	headerHeight: 26;
+	roundedBottomCorners: true;
+	backgroundAlpha: 1;
+	backgroundColor: #FFFFFF;
+	backgroundImage: Embed(source="assets/swf/Blue.swf", symbol="Window_Background");
+	backgroundSize: '100%';
+	
+	borderStyle: solid;
+	borderColor: #ffffff;
+	borderAlpha: 1;
+	borderThickness: 2;
+	borderThicknessLeft: 0;
+	borderThicknessTop: 0;
+	borderThicknessBottom: 0;
+	borderThicknessRight: 0;
+	cornerRadius: 4;
+	dropShadowEnabled: false;
+	titleStyleName: "mypanelTitle";
+	
+	cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
+	cornerResizeWidth: 15;
+	cornerResizeHeight: 15;
+	cornerResizePaddingRight: 2;
+	cornerResizePaddingBottom: 2;
+	
+	controlButtonWidth: 10;
+	controlButtonHeight: 10;
+	controlButtonGap: 4;
+}
+
+.mdiWindowNoFocus 
+{
+	headerHeight: 26;
+	roundedBottomCorners: true;
+	backgroundAlpha: 0.5;
+	backgroundImage: Embed(source="assets/swf/Blue.swf", symbol="Window_Background");
+	backgroundSize: '100%';
+	
+	borderStyle: solid;
+	borderColor: #ffffff;
+	borderAlpha: 1;
+	borderThickness: 2;
+	borderThicknessLeft: 0;
+	borderThicknessTop: 0;
+	borderThicknessBottom: 0;
+	borderThicknessRight: 0;
+	cornerRadius: 4;
+	dropShadowEnabled: false;
+	titleStyleName: "mypanelTitle";
+	
+	cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
+	cornerResizeWidth: 15;
+	cornerResizeHeight: 15;
+	cornerResizePaddingRight: 2;
+	cornerResizePaddingBottom: 2;
+	
+	controlButtonWidth: 10;
+	controlButtonHeight: 10;
+	controlButtonGap: 4;
+}
+
+.mypanelTitle 
+{
+	fontFamily: Arial;
+	fontSize: 12;
+	fontWeight: bold;
+	color: #ffffff;
+}
+
+
+.closeBtnFocus
+{
+	upSkin:        Embed('assets/img/3_closeButton.png');
+	overSkin:      Embed('assets/img/3_closeButton.png');
+	downSkin:      Embed('assets/img/3_closeButton.png');
+	disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+.closeBtnNoFocus
+{
+	upSkin:        Embed('assets/img/3_closeButton.png');
+	overSkin:      Embed('assets/img/3_closeButton.png');
+	downSkin:      Embed('assets/img/3_closeButton.png');
+	disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+
+.increaseBtnFocus
+{
+	upSkin:        Embed('assets/img/3_increaseButton.png');
+	overSkin:      Embed('assets/img/3_increaseButton.png');
+	downSkin:      Embed('assets/img/3_increaseButton.png');
+	disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+.increaseBtnNoFocus
+{
+	upSkin:        Embed('assets/img/3_increaseButton.png');
+	overSkin:      Embed('assets/img/3_increaseButton.png');
+	downSkin:      Embed('assets/img/3_increaseButton.png');
+	disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+
+.decreaseBtnFocus 
+{
+	upSkin:        Embed('assets/img/3_decreaseButton.png');
+	overSkin:      Embed('assets/img/3_decreaseButton.png');
+	downSkin:      Embed('assets/img/3_decreaseButton.png');
+	disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+.decreaseBtnNoFocus 
+{
+	upSkin:        Embed('assets/img/3_decreaseButton.png');
+	overSkin:      Embed('assets/img/3_decreaseButton.png');
+	downSkin:      Embed('assets/img/3_decreaseButton.png');
+	disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+
+.minimizeBtnFocus 
+{
+	upSkin:        Embed('assets/img/3_minimizeButton.png');
+	overSkin:      Embed('assets/img/3_minimizeButton.png');
+	downSkin:      Embed('assets/img/3_minimizeButton.png');
+	disabledSkin:  Embed('assets/img/3_minimizeButton.png');
+}
+
+.minimizeBtnNoFocus 
+{
+	upSkin:        Embed('assets/img/3_minimizeButton.png');
+	overSkin:      Embed('assets/img/3_minimizeButton.png');
+	downSkin:      Embed('assets/img/3_minimizeButton.png');
+	disabledSkin:  Embed('assets/img/3_minimizeButton.png');
+}
+
+
+.resizeHndlr 
+{
+	upSkin:        Embed('assets/img/resizeHandler.png');
+	overSkin:      Embed('assets/img/resizeHandler.png');
+	downSkin:      Embed('assets/img/resizeHandler.png');
+	disabledSkin:  Embed('assets/img/resizeHandler.png');
+}
\ No newline at end of file
diff --git a/bigbluebutton-client/branding/css/BrushedMetal.css b/bigbluebutton-client/branding/css/BrushedMetal.css
new file mode 100755
index 0000000000..4bb394c2c4
--- /dev/null
+++ b/bigbluebutton-client/branding/css/BrushedMetal.css
@@ -0,0 +1,100 @@
+Application
+{
+	
+	backgroundImage: Embed(source="assets/img/BrushedMetalBack.jpg"); 
+	backgroundSize: "100%";
+   themeColor: #999999;
+    fontFamily: Arial;
+    paddingLeft:10; paddingRight:10; paddingTop:10; paddingBottom:10;
+}
+
+.mdiWindowFocus 
+{
+	borderStyle: solid;
+   borderColor: #FFFFFF;
+   borderAlpha: 0;
+   borderThickness: 1;
+   borderThicknessLeft: 5;
+   borderThicknessTop: 5;
+   borderThicknessBottom: 15;
+   borderThicknessRight: 5;
+   roundedBottomCorners: true;
+   cornerRadius: 5;
+   headerHeight: 27;
+   
+   backgroundAlpha: 1; 
+   backgroundColor: #FFFFFF;
+   
+	backgroundImage: Embed(source="assets/swf/BrushedMetal.swf", symbol="Window_Background");
+	backgroundSize: "100%";
+	
+   dropShadowEnabled: true;
+	
+	
+	cornerResizeImg: Embed(source="assets/swf/BrushedMetal.swf", symbol="Corner_Resize");
+	cornerResizeWidth: 12;
+	cornerResizeHeight: 12;
+	cornerResizePaddingRight: 2;
+	cornerResizePaddingBottom: 2;
+	
+	titleStyleName: "mypanelTitle";
+	titleBackgroundSkin: Embed(source="assets/swf/BrushedMetal.swf", symbol="header");
+	
+	controlButtonWidth: 10;
+	controlButtonHeight: 10;
+	controlButtonGap: 8;
+}
+
+.mdiWindowNoFocus 
+{
+	borderStyle: solid;
+   borderColor: #FFFFFF;
+   borderAlpha: 0;
+   borderThickness: 1;
+   borderThicknessLeft: 5;
+   borderThicknessTop: 5;
+   borderThicknessBottom: 15;
+   borderThicknessRight: 5;
+   roundedBottomCorners: true;
+   cornerRadius: 5;
+   headerHeight: 27;
+   
+
+	
+   
+   backgroundAlpha: 1; 
+   backgroundColor: #FFFFFF;
+   
+	backgroundImage: Embed(source="assets/swf/BrushedMetal.swf", symbol="Window_Background");
+	backgroundSize: "100%";
+	
+   dropShadowEnabled: true;
+	
+	
+	cornerResizeImg: Embed(source="assets/swf/BrushedMetal.swf", symbol="Corner_Resize");
+	cornerResizeWidth: 12;
+	cornerResizeHeight: 12;
+	cornerResizePaddingRight: 2;
+	cornerResizePaddingBottom: 2;
+	
+	titleStyleName: "mypanelTitle";
+	titleBackgroundSkin: Embed(source="assets/swf/BrushedMetal.swf", symbol="header");
+	
+	controlButtonWidth: 10;
+	controlButtonHeight: 10;
+	controlButtonGap: 8;
+}
+
+
+
+.mypanelTitle {
+	fontSize: 12;
+	fontWeight: bold;
+	color: #000000;
+}
+
+
+Button {
+   fillColors: #ffffff, #999999, #ffffff, #eeeeee;
+   themeColor: #999999;
+}
diff --git a/bigbluebutton-client/branding/css/MacOS9.css b/bigbluebutton-client/branding/css/MacOS9.css
new file mode 100755
index 0000000000..98a49cdf6f
--- /dev/null
+++ b/bigbluebutton-client/branding/css/MacOS9.css
@@ -0,0 +1,83 @@
+Application
+{
+	background-image: Embed(source="assets/img/wallpaperOS9.gif");
+}
+
+MDIWindow
+{
+	titleStyleName: "macTitle";
+}
+
+.macTitle
+{
+	fontFamily: Georgia;
+	fontSize: 12;
+	fontWeight: normal;
+	color: #000000;
+}
+
+.mdiWindowFocus
+{
+	borderColor: #CCCCCC;
+	borderAlpha: 1;
+	borderThicknessLeft: 2;
+	borderThicknessTop: 0;
+	borderThicknessBottom: 2;
+	borderThicknessRight: 2;
+	roundedBottomCorners: false;
+	cornerRadius: 5;
+	dropShadowEnabled: false;
+	headerHeight: 29;
+	backgroundAlpha: 1; 
+	backgroundColor: #FFFFFF;	
+	titleBackgroundSkin: Embed(source="assets/swf/WindowsAssets.swf", symbol="macHeaderFocus");
+}
+
+.mdiWindowNoFocus
+{
+	borderColor: #CCCCCC;
+	borderAlpha: 1;
+	borderThicknessLeft: 2;
+	borderThicknessTop: 0;
+	borderThicknessBottom: 2;
+	borderThicknessRight: 2;
+	roundedBottomCorners: false;
+	cornerRadius: 5;
+	dropShadowEnabled: false;
+	headerHeight: 29;
+	backgroundAlpha: 1; 
+	backgroundColor: #FFFFFF;
+	titleBackgroundSkin: Embed(source="assets/swf/WindowsAssets.swf", symbol="macHeaderNoFocus");
+}
+
+.mdiWindowMinimizeBtn
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnOS9");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnOS9");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnOS9");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnOS9");
+}
+
+.mdiWindowMaximizeBtn
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
+}
+
+.mdiWindowRestoreBtn
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
+}
+
+.mdiWindowCloseBtn
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnOS9");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnOS9");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnOS9");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnOS9");
+}
\ No newline at end of file
diff --git a/bigbluebutton-client/branding/css/S2S.css b/bigbluebutton-client/branding/css/S2S.css
new file mode 100755
index 0000000000..524396a456
--- /dev/null
+++ b/bigbluebutton-client/branding/css/S2S.css
@@ -0,0 +1,609 @@
+Application 
+{  
+  themeColor: #CCC;
+  backgroundGradientAlphas: 1, 1;  
+  backgroundGradientColors: #FFF, #FFF;
+  color: #504f3d;
+  fontFamily: Arial;
+}
+
+ApplicationControlBar {
+  fillAlphas: 1, 1;
+  fillColors: #ffffff, #fffcf5;
+  backgroundAlpha: 0;
+  dropShadowEnabled: true;
+  shadowDistance: 1
+}
+
+
+MDICanvas 
+{
+  backgroundColor: #FFFFFF;
+  backgroundAlpha: 0;
+}
+
+
+Button 
+{
+  cornerRadius: 0;
+  highlightAlphas: 0, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fff, #fff, #f6eded, #f6eded;
+  color: #504f3d;
+  textRollOverColor: #e6e3dc;
+  textSelectedColor: #d6d4c9;
+  borderColor: #bebcac;
+  themeColor:#d6d4c9;
+  fontFamily: Arial;
+  fontSize: 12;
+  
+  
+}
+
+Button.Present{
+  cornerRadius: 0;
+  highlightAlphas: 0, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #262626, #262626, #454545, #454545;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #262626;
+  borderColor: #000000;
+  themeColor: #000000;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+Button.Send{
+  cornerRadius: 0;
+  highlightAlphas: 0, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #262626, #262626, #454545, #454545;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #262626;
+  borderColor: #000000;
+  themeColor: #000000;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+Button.Logout{
+  cornerRadius: 0;
+  highlightAlphas: 0, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #262626, #262626, #454545, #454545;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #262626;
+  borderColor: #000000;
+  themeColor: #000000;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+LinkButton {
+  rollOverColor: #cccccc;
+  selectionColor: #999999;
+  color: #504f3d;
+  textRollOverColor: #504f3d;
+  textSelectedColor: #504f3d;
+}
+
+VScrollBar {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #ffffff, #ffffff, #ffffff, #ffffff;
+  trackColors: #94999b, #e7e7e7;
+  themeColor: #333333;
+}
+
+ComboBox {
+  color: #504f3d;
+  borderColor: #999999;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #ffffff, #ffffff, #ffffff, #ffffff;
+  selectionColor: #cccccc;
+  textSelectedColor: #504f3d;
+  useRollOver: true;
+  rollOverColor: #cccccc;
+  textRollOverColor: #ffffff;
+  themeColor: #999999;
+}
+
+VBox.whiteboardToolbarStyle {
+  backgroundColor: #4798C6;
+  cornerRadius: 5;
+  borderColor: #2D586E;
+  borderStyle: solid;
+  borderThickness: 1;
+  paddingBottom: 3;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+}
+
+Button.whiteboardButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+}
+
+.whiteboardUndoButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/undo.png');
+}
+
+.whiteboardCircleButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/ellipse.png');  
+}
+
+.whiteboardClearButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/trash.png');    
+}
+
+.whiteboardScribbleButtonStyle{
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/marker.png');  
+}
+
+.whiteboardLineButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/line.png');    
+}
+
+.whiteboardPanZoomButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/hand.png');   
+}
+
+.whiteboardRectangleButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/square.png');   
+}
+
+.whiteboardTextButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/text.png');   
+}
+
+.whiteboardTriangleButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/triangle.png');    
+}
+
+.presentationUploadButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/upload.png'); 
+}
+
+.presentationBackButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/left-arrow.png'); 
+}
+
+.presentationForwardButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/right-arrow.png'); 
+}
+
+.presentationFitToWidthButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/fit-to-width.png'); 
+}
+
+.presentationFitToPageButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/fit-to-screen.png'); 
+}
+
+.presentationZoomSliderStyle{
+  labelOffset: 0;
+  thumbOffset: 3;
+  dataTipOffset: -1;
+  tickOffset: 2;
+  tickLength: 5;
+  tickThickness: 2;
+  tickColor: #6cccff;
+  showTrackHighlight: true;
+  invertThumbDirection: false;
+  borderColor: #6cccff;
+  trackColors: #6cccff, #6cccff;
+  themeColor: #6cccff;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #6cccff, #6cccff, #6cccff, #6cccff;
+  labelStyleName: "presentationZoomSliderLabelStyle";
+}
+
+.presentationZoomSliderLabelStyle {
+  color: #6cccff;
+  fontFamily: Arial;
+}
+
+MDIWindow {
+  resizeCursorHorizontalXOffset: 20	
+}
+
+.mdiWindowFocus 
+{
+  headerHeight: 26;
+  roundedBottomCorners: false;
+  backgroundAlpha: 1;
+  backgroundColor: #003650;
+  backgroundSize: '100%';
+  
+  borderStyle: solid;
+  borderColor: #003650;
+  borderAlpha: 1;
+  borderThickness: 2;
+  borderThicknessLeft: 6;
+  borderThicknessTop: 6;
+  borderThicknessBottom: 6;
+  borderThicknessRight: 6;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+  
+  cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
+  cornerResizeWidth: 15;
+  cornerResizeHeight: 15;
+  cornerResizePaddingRight: 2;
+  cornerResizePaddingBottom: 2;
+  
+  controlButtonWidth: 10;
+  controlButtonHeight: 10;
+  controlButtonGap: 4;
+}
+
+.mdiWindowNoFocus 
+{
+  headerHeight: 26;
+  roundedBottomCorners: false;
+  backgroundAlpha: 0.5;
+  backgroundColor: #003650;
+  backgroundSize: '100%';
+  
+  borderStyle: solid;
+  borderColor: #003650;
+  borderAlpha: 1;
+  borderThickness: 2;
+  borderThicknessLeft: 6;
+  borderThicknessTop: 6;
+  borderThicknessBottom: 6;
+  borderThicknessRight: 6;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+  
+  cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
+  cornerResizeWidth: 15;
+  cornerResizeHeight: 15;
+  cornerResizePaddingRight: 2;
+  cornerResizePaddingBottom: 2;
+  
+  controlButtonWidth: 10;
+  controlButtonHeight: 10;
+  controlButtonGap: 4;
+}
+
+.presentationWindowStyleNoFocus 
+{
+  borderColor: #242424;
+  borderAlpha: 1;
+  borderThicknessLeft: 0;
+  borderThicknessTop: 0;
+  borderThicknessBottom: 0;
+  borderThicknessRight: 0;
+  roundedBottomCorners: false;
+  cornerRadius: 0;
+  headerHeight: 0;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.presentationWindowStyleFocus 
+{
+  borderColor: #242424;
+  borderAlpha: 1;
+  borderThicknessLeft: 0;
+  borderThicknessTop: 0;
+  borderThicknessBottom: 0;
+  borderThicknessRight: 0;
+  roundedBottomCorners: false;
+  cornerRadius: 0;
+  headerHeight: 0;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.presentationSlideViewStyle {
+  backgroundColor: #003650;
+}
+
+.presentationWindowControlsStyle {
+  paddingBottom: 5;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+  bottom: 5;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+}
+
+.videoDockStyleNoFocus 
+{
+  borderColor: #242424;
+  borderAlpha: 1;
+  borderThicknessLeft: 0;
+  borderThicknessTop: 0;
+  borderThicknessBottom: 0;
+  borderThicknessRight: 0;
+  roundedBottomCorners: false;
+  cornerRadius: 0;
+  headerHeight: 0;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoDockStyleFocus 
+{
+  borderColor: #242424;
+  borderAlpha: 1;
+  borderThicknessLeft: 0;
+  borderThicknessTop: 0;
+  borderThicknessBottom: 0;
+  borderThicknessRight: 0;
+  roundedBottomCorners: false;
+  cornerRadius: 0;
+  headerHeight: 0;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoViewStyleNoFocus 
+{
+  borderColor: #003650;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoViewStyleFocus 
+{
+  borderColor: #003650;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoPublishStyleNoFocus 
+{
+  borderColor: #003650;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoPublishStyleFocus 
+{
+  borderColor: #003650;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoAvatarStyleNoFocus 
+{
+  borderColor: #003650;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoAvatarStyleFocus 
+{
+  borderColor: #003650;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.mypanelTitle {
+  color: #6cccff;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+.closeBtnFocus
+{
+  upSkin:        Embed('assets/img/3_closeButton.png');
+  overSkin:      Embed('assets/img/3_closeButton.png');
+  downSkin:      Embed('assets/img/3_closeButton.png');
+  disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+.closeBtnNoFocus
+{
+  upSkin:        Embed('assets/img/3_closeButton.png');
+  overSkin:      Embed('assets/img/3_closeButton.png');
+  downSkin:      Embed('assets/img/3_closeButton.png');
+  disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+
+.increaseBtnFocus
+{
+  upSkin:        Embed('assets/img/3_increaseButton.png');
+  overSkin:      Embed('assets/img/3_increaseButton.png');
+  downSkin:      Embed('assets/img/3_increaseButton.png');
+  disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+.increaseBtnNoFocus
+{
+  upSkin:        Embed('assets/img/3_increaseButton.png');
+  overSkin:      Embed('assets/img/3_increaseButton.png');
+  downSkin:      Embed('assets/img/3_increaseButton.png');
+  disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+
+.decreaseBtnFocus 
+{
+  upSkin:        Embed('assets/img/3_decreaseButton.png');
+  overSkin:      Embed('assets/img/3_decreaseButton.png');
+  downSkin:      Embed('assets/img/3_decreaseButton.png');
+  disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+.decreaseBtnNoFocus 
+{
+  upSkin:        Embed('assets/img/3_decreaseButton.png');
+  overSkin:      Embed('assets/img/3_decreaseButton.png');
+  downSkin:      Embed('assets/img/3_decreaseButton.png');
+  disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+
+.minimizeBtnFocus 
+{
+  upSkin:        Embed('assets/img/3_minimizeButton.png');
+  overSkin:      Embed('assets/img/3_minimizeButton.png');
+  downSkin:      Embed('assets/img/3_minimizeButton.png');
+  disabledSkin:  Embed('assets/img/3_minimizeButton.png');
+}
+
+
+.resizeHndlr 
+{
+  upSkin:        Embed('assets/img/resizeHandler.png');
+  overSkin:      Embed('assets/img/resizeHandler.png');
+  downSkin:      Embed('assets/img/resizeHandler.png');
+  disabledSkin:  Embed('assets/img/resizeHandler.png');
+}
diff --git a/bigbluebutton-client/branding/css/WindowsXP_default.css b/bigbluebutton-client/branding/css/WindowsXP_default.css
new file mode 100755
index 0000000000..f7f143a4d6
--- /dev/null
+++ b/bigbluebutton-client/branding/css/WindowsXP_default.css
@@ -0,0 +1,143 @@
+/*
+Copyright (c) 2007 FlexLib Contributors.  See:
+    http://code.google.com/p/flexlib/wiki/ProjectContributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+Application
+{
+	background-image: Embed(source="assets/img/wallpaperWin.jpg");
+}
+
+MDIWindow
+{
+	titleStyleName: "winXPTitleStyle";
+	
+	minimizeBtnStyleNameNoFocus: "mdiWindowMinimizeBtnNoFocus";
+	maximizeBtnStyleNameNoFocus: "mdiWindowMaximizeBtnNoFocus";
+	restoreBtnStyleNameNoFocus: "mdiWindowRestoreBtnNoFocus";
+	closeBtnStyleNameNoFocus: "mdiWindowCloseBtnNoFocus";
+}
+
+.winXPTitleStyle
+{
+	fontFamily: Verdana;
+	fontSize: 12;
+	fontWeight: normal;
+	color: #FFFFFF;
+}
+
+.mdiWindowFocus
+{
+	borderColor: #0053E1;
+	borderAlpha: 1;
+	borderThicknessLeft: 2;
+	borderThicknessTop: 0;
+	borderThicknessBottom: 2;
+	borderThicknessRight: 2;
+	roundedBottomCorners: false;
+	cornerRadius: 5;
+	dropShadowEnabled: false;
+	headerHeight: 29;
+	backgroundAlpha: 1; 
+	backgroundColor: #FFFFFF;
+	titleBackgroundSkin: Embed(source="assets/swf/WindowsAssets.swf", symbol="headerBgDefault");
+}
+
+.mdiWindowNoFocus
+{
+	borderColor: #7B97E0;
+	borderAlpha: 1;
+	borderThicknessLeft: 2;
+	borderThicknessTop: 0;
+	borderThicknessBottom: 2;
+	borderThicknessRight: 2;
+	roundedBottomCorners: false;
+	cornerRadius: 5;
+	dropShadowEnabled: false;
+	headerHeight: 29;
+	backgroundAlpha: 1; 
+	backgroundColor: #FFFFFF;
+	titleBackgroundSkin: Embed(source="assets/swf/WindowsAssets.swf", symbol="headerBgDefaultNoFocus");
+	
+}
+
+.mdiWindowMinimizeBtn
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefault_up");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefault_over");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefault_down");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
+}
+
+.mdiWindowMinimizeBtnNoFocus
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
+}
+
+.mdiWindowMaximizeBtn
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefault_up");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefault_over");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefault_down");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
+}
+
+.mdiWindowMaximizeBtnNoFocus
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
+}
+
+.mdiWindowRestoreBtn
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefault_up");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefault_over");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefault_down");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
+}
+
+.mdiWindowRestoreBtnNoFocus
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
+}
+
+.mdiWindowCloseBtn
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefault_up");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefault_over");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefault_down");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
+}
+
+.mdiWindowCloseBtnNoFocus
+{
+	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
+	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
+	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
+	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
+}
\ No newline at end of file
diff --git a/bigbluebutton-client/branding/css/assets/images/BBBlogo.png b/bigbluebutton-client/branding/css/assets/images/BBBlogo.png
new file mode 100755
index 0000000000..2e9f8151f4
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/BBBlogo.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/Cursor.png b/bigbluebutton-client/branding/css/assets/images/Cursor.png
new file mode 100755
index 0000000000..6e29c43729
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/Cursor.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/add.png b/bigbluebutton-client/branding/css/assets/images/add.png
new file mode 100755
index 0000000000..6332fefea4
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/add.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/administrator.gif b/bigbluebutton-client/branding/css/assets/images/administrator.gif
new file mode 100755
index 0000000000..608d2d165c
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/administrator.gif differ
diff --git a/bigbluebutton-client/branding/css/assets/images/application_put.png b/bigbluebutton-client/branding/css/assets/images/application_put.png
new file mode 100755
index 0000000000..c30cf59894
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/application_put.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/arrow_in.png b/bigbluebutton-client/branding/css/assets/images/arrow_in.png
new file mode 100755
index 0000000000..745c65134d
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/arrow_in.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/arrow_left.png b/bigbluebutton-client/branding/css/assets/images/arrow_left.png
new file mode 100755
index 0000000000..56ee138d14
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/arrow_left.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/arrow_out.png b/bigbluebutton-client/branding/css/assets/images/arrow_out.png
new file mode 100755
index 0000000000..2e9bc42bec
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/arrow_out.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/arrow_right.png b/bigbluebutton-client/branding/css/assets/images/arrow_right.png
new file mode 100755
index 0000000000..f455031232
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/arrow_right.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/arrow_undo.png b/bigbluebutton-client/branding/css/assets/images/arrow_undo.png
new file mode 100755
index 0000000000..e0f8038cff
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/arrow_undo.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/blank-circle.png b/bigbluebutton-client/branding/css/assets/images/blank-circle.png
new file mode 100755
index 0000000000..f3b2a1360a
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/blank-circle.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/bullet_go.png b/bigbluebutton-client/branding/css/assets/images/bullet_go.png
new file mode 100755
index 0000000000..bc4faa709e
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/bullet_go.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/cancel.png b/bigbluebutton-client/branding/css/assets/images/cancel.png
new file mode 100755
index 0000000000..3950faf59d
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/cancel.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/circle.png b/bigbluebutton-client/branding/css/assets/images/circle.png
new file mode 100755
index 0000000000..06e7ffa986
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/circle.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/control_play_blue.png b/bigbluebutton-client/branding/css/assets/images/control_play_blue.png
new file mode 100755
index 0000000000..f8c8ec683e
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/control_play_blue.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/deskshare_icon.png b/bigbluebutton-client/branding/css/assets/images/deskshare_icon.png
new file mode 100755
index 0000000000..e9065faaf0
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/deskshare_icon.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/ellipse.png b/bigbluebutton-client/branding/css/assets/images/ellipse.png
new file mode 100755
index 0000000000..ce5466bfe0
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/ellipse.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/fit-to-screen.png b/bigbluebutton-client/branding/css/assets/images/fit-to-screen.png
new file mode 100755
index 0000000000..fe28c01d24
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/fit-to-screen.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/fit-to-width.png b/bigbluebutton-client/branding/css/assets/images/fit-to-width.png
new file mode 100755
index 0000000000..f991166ed6
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/fit-to-width.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/forward_blue.png b/bigbluebutton-client/branding/css/assets/images/forward_blue.png
new file mode 100755
index 0000000000..4a2f9d4e4a
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/forward_blue.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/green-circle.png b/bigbluebutton-client/branding/css/assets/images/green-circle.png
new file mode 100755
index 0000000000..08f8b8c25a
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/green-circle.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/hand.png b/bigbluebutton-client/branding/css/assets/images/hand.png
new file mode 100755
index 0000000000..c6bcefaea0
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/hand.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/icons-license.txt b/bigbluebutton-client/branding/css/assets/images/icons-license.txt
new file mode 100755
index 0000000000..9f25609678
--- /dev/null
+++ b/bigbluebutton-client/branding/css/assets/images/icons-license.txt
@@ -0,0 +1,38 @@
+Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com
+
+==================================================
+Diagona Icons
+
+Copyright (C) 2007 Yusuke Kamiyamane. All rights reserved.
+The icons are licensed under a Creative Commons Attribution
+3.0 license. <http://creativecommons.org/licenses/by/3.0/>
+
+If you can't or don't want to provide a link back, please
+purchase a royalty-free license.
+<http://p.yusukekamiyamane.com/>
+
+I'm unavailable for custom icon design work. But your
+suggestions are always welcome!
+<mailto:p@yusukekamiyamane.com>
+====================
\ No newline at end of file
diff --git a/bigbluebutton-client/branding/css/assets/images/left-arrow.png b/bigbluebutton-client/branding/css/assets/images/left-arrow.png
new file mode 100755
index 0000000000..3117136c1f
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/left-arrow.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/line.png b/bigbluebutton-client/branding/css/assets/images/line.png
new file mode 100755
index 0000000000..e0abedeaae
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/line.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/lock.png b/bigbluebutton-client/branding/css/assets/images/lock.png
new file mode 100755
index 0000000000..ff45911300
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/lock.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/lock_close.png b/bigbluebutton-client/branding/css/assets/images/lock_close.png
new file mode 100755
index 0000000000..2ebc4f6f96
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/lock_close.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/lock_open.png b/bigbluebutton-client/branding/css/assets/images/lock_open.png
new file mode 100755
index 0000000000..a471765ff1
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/lock_open.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/magnifier.png b/bigbluebutton-client/branding/css/assets/images/magnifier.png
new file mode 100755
index 0000000000..415b81f589
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/magnifier.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/magnifier_reset.png b/bigbluebutton-client/branding/css/assets/images/magnifier_reset.png
new file mode 100755
index 0000000000..7f9d1f10fe
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/magnifier_reset.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/marker.png b/bigbluebutton-client/branding/css/assets/images/marker.png
new file mode 100755
index 0000000000..7a026099e3
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/marker.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/page_white_get.png b/bigbluebutton-client/branding/css/assets/images/page_white_get.png
new file mode 100755
index 0000000000..5e3c3db492
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/page_white_get.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/participant-mute.png b/bigbluebutton-client/branding/css/assets/images/participant-mute.png
new file mode 100755
index 0000000000..57b6320479
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/participant-mute.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/participant.gif b/bigbluebutton-client/branding/css/assets/images/participant.gif
new file mode 100755
index 0000000000..d307b20068
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/participant.gif differ
diff --git a/bigbluebutton-client/branding/css/assets/images/pencil.png b/bigbluebutton-client/branding/css/assets/images/pencil.png
new file mode 100755
index 0000000000..b24e7d15e6
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/pencil.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/presenter.png b/bigbluebutton-client/branding/css/assets/images/presenter.png
new file mode 100755
index 0000000000..c1974cda74
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/presenter.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/raisehand.png b/bigbluebutton-client/branding/css/assets/images/raisehand.png
new file mode 100755
index 0000000000..edc8fdc463
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/raisehand.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/red-circle.png b/bigbluebutton-client/branding/css/assets/images/red-circle.png
new file mode 100755
index 0000000000..1c500ba34e
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/red-circle.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/right-arrow.png b/bigbluebutton-client/branding/css/assets/images/right-arrow.png
new file mode 100755
index 0000000000..f00775a7ea
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/right-arrow.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/settings.png b/bigbluebutton-client/branding/css/assets/images/settings.png
new file mode 100755
index 0000000000..92692173f2
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/settings.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/shape_handles.png b/bigbluebutton-client/branding/css/assets/images/shape_handles.png
new file mode 100755
index 0000000000..ce27fe3a03
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/shape_handles.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/shape_move_front.png b/bigbluebutton-client/branding/css/assets/images/shape_move_front.png
new file mode 100755
index 0000000000..b4a4e3b785
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/shape_move_front.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/shape_square.png b/bigbluebutton-client/branding/css/assets/images/shape_square.png
new file mode 100755
index 0000000000..f365749181
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/shape_square.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/sound.png b/bigbluebutton-client/branding/css/assets/images/sound.png
new file mode 100755
index 0000000000..6056d234a9
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/sound.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/sound_mute.png b/bigbluebutton-client/branding/css/assets/images/sound_mute.png
new file mode 100755
index 0000000000..b652d2a71f
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/sound_mute.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/sound_none.png b/bigbluebutton-client/branding/css/assets/images/sound_none.png
new file mode 100755
index 0000000000..a229352925
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/sound_none.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/square.png b/bigbluebutton-client/branding/css/assets/images/square.png
new file mode 100755
index 0000000000..bdceb2e474
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/square.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/table.png b/bigbluebutton-client/branding/css/assets/images/table.png
new file mode 100755
index 0000000000..abcd93689a
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/table.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/text.png b/bigbluebutton-client/branding/css/assets/images/text.png
new file mode 100755
index 0000000000..819b580392
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/text.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/trash.png b/bigbluebutton-client/branding/css/assets/images/trash.png
new file mode 100755
index 0000000000..2b95a3faa6
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/trash.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/triangle.png b/bigbluebutton-client/branding/css/assets/images/triangle.png
new file mode 100755
index 0000000000..0530c3deb6
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/triangle.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/undo.png b/bigbluebutton-client/branding/css/assets/images/undo.png
new file mode 100755
index 0000000000..43a7e19fc6
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/undo.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/unlock.png b/bigbluebutton-client/branding/css/assets/images/unlock.png
new file mode 100755
index 0000000000..7177da02e7
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/unlock.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/upload.png b/bigbluebutton-client/branding/css/assets/images/upload.png
new file mode 100755
index 0000000000..030cc3e82a
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/upload.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/user.png b/bigbluebutton-client/branding/css/assets/images/user.png
new file mode 100755
index 0000000000..79f35ccbda
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/user.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/user_go.png b/bigbluebutton-client/branding/css/assets/images/user_go.png
new file mode 100755
index 0000000000..0468cf08f3
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/user_go.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/user_gray.png b/bigbluebutton-client/branding/css/assets/images/user_gray.png
new file mode 100755
index 0000000000..8fd539e9cb
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/user_gray.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/user_green.png b/bigbluebutton-client/branding/css/assets/images/user_green.png
new file mode 100755
index 0000000000..30383c2de5
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/user_green.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/user_orange.png b/bigbluebutton-client/branding/css/assets/images/user_orange.png
new file mode 100755
index 0000000000..b818127df6
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/user_orange.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/user_red.png b/bigbluebutton-client/branding/css/assets/images/user_red.png
new file mode 100755
index 0000000000..c6f66e8b30
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/user_red.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/webcam.png b/bigbluebutton-client/branding/css/assets/images/webcam.png
new file mode 100755
index 0000000000..af71c30610
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/webcam.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/whiteboard_icon.png b/bigbluebutton-client/branding/css/assets/images/whiteboard_icon.png
new file mode 100755
index 0000000000..aee99fc0c7
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/whiteboard_icon.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/whiteboard_thick.png b/bigbluebutton-client/branding/css/assets/images/whiteboard_thick.png
new file mode 100755
index 0000000000..bff4086240
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/whiteboard_thick.png differ
diff --git a/bigbluebutton-client/branding/css/assets/images/whiteboard_thin.png b/bigbluebutton-client/branding/css/assets/images/whiteboard_thin.png
new file mode 100755
index 0000000000..2967c92434
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/images/whiteboard_thin.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/3_closeButton.png b/bigbluebutton-client/branding/css/assets/img/3_closeButton.png
new file mode 100755
index 0000000000..6439bca62b
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/3_closeButton.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/3_decreaseButton.png b/bigbluebutton-client/branding/css/assets/img/3_decreaseButton.png
new file mode 100755
index 0000000000..78acfd2470
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/3_decreaseButton.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/3_increaseButton.png b/bigbluebutton-client/branding/css/assets/img/3_increaseButton.png
new file mode 100755
index 0000000000..efadb1bf07
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/3_increaseButton.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/3_minimizeButton.png b/bigbluebutton-client/branding/css/assets/img/3_minimizeButton.png
new file mode 100755
index 0000000000..bf90eb5814
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/3_minimizeButton.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/BBBLogo.png b/bigbluebutton-client/branding/css/assets/img/BBBLogo.png
new file mode 100755
index 0000000000..9f1fa1235f
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/BBBLogo.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/BrushedMetalBack.jpg b/bigbluebutton-client/branding/css/assets/img/BrushedMetalBack.jpg
new file mode 100755
index 0000000000..2db8716599
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/BrushedMetalBack.jpg differ
diff --git a/bigbluebutton-client/branding/css/assets/img/add.png b/bigbluebutton-client/branding/css/assets/img/add.png
new file mode 100755
index 0000000000..6332fefea4
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/add.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/administrator.gif b/bigbluebutton-client/branding/css/assets/img/administrator.gif
new file mode 100755
index 0000000000..608d2d165c
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/administrator.gif differ
diff --git a/bigbluebutton-client/branding/css/assets/img/annotation.png b/bigbluebutton-client/branding/css/assets/img/annotation.png
new file mode 100755
index 0000000000..fb7cb8e9e7
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/annotation.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/application_put.png b/bigbluebutton-client/branding/css/assets/img/application_put.png
new file mode 100755
index 0000000000..c30cf59894
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/application_put.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/arrow_in.png b/bigbluebutton-client/branding/css/assets/img/arrow_in.png
new file mode 100755
index 0000000000..745c65134d
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/arrow_in.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/arrow_left.png b/bigbluebutton-client/branding/css/assets/img/arrow_left.png
new file mode 100755
index 0000000000..56ee138d14
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/arrow_left.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/arrow_out.png b/bigbluebutton-client/branding/css/assets/img/arrow_out.png
new file mode 100755
index 0000000000..2e9bc42bec
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/arrow_out.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/arrow_right.png b/bigbluebutton-client/branding/css/assets/img/arrow_right.png
new file mode 100755
index 0000000000..f455031232
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/arrow_right.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/arrow_undo.png b/bigbluebutton-client/branding/css/assets/img/arrow_undo.png
new file mode 100755
index 0000000000..e0f8038cff
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/arrow_undo.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/avatar.png b/bigbluebutton-client/branding/css/assets/img/avatar.png
new file mode 100755
index 0000000000..2e9f8151f4
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/avatar.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/bandwidth.png b/bigbluebutton-client/branding/css/assets/img/bandwidth.png
new file mode 100755
index 0000000000..adb979ce5a
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/bandwidth.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/bk3.jpg b/bigbluebutton-client/branding/css/assets/img/bk3.jpg
new file mode 100755
index 0000000000..f6c8ab242b
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/bk3.jpg differ
diff --git a/bigbluebutton-client/branding/css/assets/img/closeButton.png b/bigbluebutton-client/branding/css/assets/img/closeButton.png
new file mode 100755
index 0000000000..82da8f0486
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/closeButton.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/cornerResize3.png b/bigbluebutton-client/branding/css/assets/img/cornerResize3.png
new file mode 100755
index 0000000000..c0e341f43f
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/cornerResize3.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/decreaseButton.png b/bigbluebutton-client/branding/css/assets/img/decreaseButton.png
new file mode 100755
index 0000000000..ae7f931fc0
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/decreaseButton.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/increaseButton.png b/bigbluebutton-client/branding/css/assets/img/increaseButton.png
new file mode 100755
index 0000000000..620353fbe0
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/increaseButton.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/menuArrow.png b/bigbluebutton-client/branding/css/assets/img/menuArrow.png
new file mode 100755
index 0000000000..38af93c846
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/menuArrow.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/mic_unmuted.png b/bigbluebutton-client/branding/css/assets/img/mic_unmuted.png
new file mode 100755
index 0000000000..d5b65fc7ef
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/mic_unmuted.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/minimizeButton.png b/bigbluebutton-client/branding/css/assets/img/minimizeButton.png
new file mode 100755
index 0000000000..0178081ebf
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/minimizeButton.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/resizeCursor.png b/bigbluebutton-client/branding/css/assets/img/resizeCursor.png
new file mode 100755
index 0000000000..a64e80cd9d
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/resizeCursor.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/resizeCursorH.gif b/bigbluebutton-client/branding/css/assets/img/resizeCursorH.gif
new file mode 100755
index 0000000000..daa8facfa1
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/resizeCursorH.gif differ
diff --git a/bigbluebutton-client/branding/css/assets/img/resizeCursorTLBR.gif b/bigbluebutton-client/branding/css/assets/img/resizeCursorTLBR.gif
new file mode 100755
index 0000000000..d0c72562c0
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/resizeCursorTLBR.gif differ
diff --git a/bigbluebutton-client/branding/css/assets/img/resizeCursorTRBL.gif b/bigbluebutton-client/branding/css/assets/img/resizeCursorTRBL.gif
new file mode 100755
index 0000000000..442efa5d48
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/resizeCursorTRBL.gif differ
diff --git a/bigbluebutton-client/branding/css/assets/img/resizeCursorV.gif b/bigbluebutton-client/branding/css/assets/img/resizeCursorV.gif
new file mode 100755
index 0000000000..6061a32a9a
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/resizeCursorV.gif differ
diff --git a/bigbluebutton-client/branding/css/assets/img/resizeCursorVH.gif b/bigbluebutton-client/branding/css/assets/img/resizeCursorVH.gif
new file mode 100755
index 0000000000..7da81d6f37
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/resizeCursorVH.gif differ
diff --git a/bigbluebutton-client/branding/css/assets/img/resizeHandler.png b/bigbluebutton-client/branding/css/assets/img/resizeHandler.png
new file mode 100755
index 0000000000..ba6e42f956
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/resizeHandler.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/sound.png b/bigbluebutton-client/branding/css/assets/img/sound.png
new file mode 100755
index 0000000000..6056d234a9
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/sound.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/video_canvas_bg.jpg b/bigbluebutton-client/branding/css/assets/img/video_canvas_bg.jpg
new file mode 100755
index 0000000000..0dfda438df
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/video_canvas_bg.jpg differ
diff --git a/bigbluebutton-client/branding/css/assets/img/video_canvas_bg.png b/bigbluebutton-client/branding/css/assets/img/video_canvas_bg.png
new file mode 100755
index 0000000000..d345e9868d
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/video_canvas_bg.png differ
diff --git a/bigbluebutton-client/branding/css/assets/img/wallpaperOS9.gif b/bigbluebutton-client/branding/css/assets/img/wallpaperOS9.gif
new file mode 100755
index 0000000000..23183806e7
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/wallpaperOS9.gif differ
diff --git a/bigbluebutton-client/branding/css/assets/img/wallpaperWin.jpg b/bigbluebutton-client/branding/css/assets/img/wallpaperWin.jpg
new file mode 100755
index 0000000000..5db85738ab
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/img/wallpaperWin.jpg differ
diff --git a/bigbluebutton-client/branding/css/assets/swf/Blue.swf b/bigbluebutton-client/branding/css/assets/swf/Blue.swf
new file mode 100755
index 0000000000..e8915ef395
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/swf/Blue.swf differ
diff --git a/bigbluebutton-client/branding/css/assets/swf/BrushedMetal.swf b/bigbluebutton-client/branding/css/assets/swf/BrushedMetal.swf
new file mode 100755
index 0000000000..06ac598e73
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/swf/BrushedMetal.swf differ
diff --git a/bigbluebutton-client/branding/css/assets/swf/WindowsAssets.swf b/bigbluebutton-client/branding/css/assets/swf/WindowsAssets.swf
new file mode 100755
index 0000000000..690ca17477
Binary files /dev/null and b/bigbluebutton-client/branding/css/assets/swf/WindowsAssets.swf differ
diff --git a/bigbluebutton-client/branding/css/logo_basic.css b/bigbluebutton-client/branding/css/logo_basic.css
new file mode 100755
index 0000000000..4c9dae3d7c
--- /dev/null
+++ b/bigbluebutton-client/branding/css/logo_basic.css
@@ -0,0 +1,6 @@
+/*The image for your logo is 200x200 pixels. No other size is currently supported so resize your logo accordingly. The logo will always appear in the lower right corner. */
+BrandingLogo
+{
+	backgroundImage: Embed(source="assets/img/BBBLogo.png");
+	backgroundSize: "100%";
+}
\ No newline at end of file
diff --git a/bigbluebutton-client/branding/css/theme.css b/bigbluebutton-client/branding/css/theme.css
new file mode 100755
index 0000000000..143ffc19c2
--- /dev/null
+++ b/bigbluebutton-client/branding/css/theme.css
@@ -0,0 +1,180 @@
+Application 
+{  
+   backgroundColors: #000000,#3f3f3f;
+   backgroundImage: Embed(source="assets/img/bk3.jpg");
+   backgroundSize: "100%";
+   backgroundGradientColors: #B4BFCF, #78829C;
+   themeColor: #0094C7;
+   backgroundGradientAlphas: 0.62, 0.26;
+}
+
+/*The image for your logo is 200x200 pixels. No other size is currently supported so resize your logo accordingly. The logo will always appear in the lower right corner. */
+BrandingLogo
+{
+	backgroundImage: Embed(source="assets/img/BBBLogo.png");
+	backgroundSize: "100%";
+}
+
+
+MDICanvas 
+{
+	backgroundColor: #0094C7;
+	backgroundAlpha: 0;
+}
+
+
+Button 
+{
+   highlightAlphas: 1, 0.33;
+   fillAlphas: 1, 0.16, 0.18, 1;
+   fillColors: #5f89b9, #697182, #ffffff, #eeeeee;
+}
+
+
+.mdiWindowFocus 
+{
+	headerHeight: 26;
+	roundedBottomCorners: true;
+	backgroundAlpha: 1;
+	backgroundColor: #FFFFFF;
+	backgroundImage: Embed(source="assets/swf/Blue.swf", symbol="Window_Background");
+	backgroundSize: '100%';
+	
+	borderStyle: solid;
+	borderColor: #ffffff;
+	borderAlpha: 1;
+	borderThickness: 2;
+	borderThicknessLeft: 0;
+	borderThicknessTop: 0;
+	borderThicknessBottom: 0;
+	borderThicknessRight: 0;
+	cornerRadius: 4;
+	dropShadowEnabled: false;
+	titleStyleName: "mypanelTitle";
+	
+	cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
+	cornerResizeWidth: 15;
+	cornerResizeHeight: 15;
+	cornerResizePaddingRight: 2;
+	cornerResizePaddingBottom: 2;
+	
+	controlButtonWidth: 10;
+	controlButtonHeight: 10;
+	controlButtonGap: 4;
+}
+
+.mdiWindowNoFocus 
+{
+	headerHeight: 26;
+	roundedBottomCorners: true;
+	backgroundAlpha: 0.5;
+	backgroundImage: Embed(source="assets/swf/Blue.swf", symbol="Window_Background");
+	backgroundSize: '100%';
+	
+	borderStyle: solid;
+	borderColor: #ffffff;
+	borderAlpha: 1;
+	borderThickness: 2;
+	borderThicknessLeft: 0;
+	borderThicknessTop: 0;
+	borderThicknessBottom: 0;
+	borderThicknessRight: 0;
+	cornerRadius: 4;
+	dropShadowEnabled: false;
+	titleStyleName: "mypanelTitle";
+	
+	cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
+	cornerResizeWidth: 15;
+	cornerResizeHeight: 15;
+	cornerResizePaddingRight: 2;
+	cornerResizePaddingBottom: 2;
+	
+	controlButtonWidth: 10;
+	controlButtonHeight: 10;
+	controlButtonGap: 4;
+}
+
+.mypanelTitle 
+{
+	fontFamily: Arial;
+	fontSize: 12;
+	fontWeight: bold;
+	color: #ffffff;
+}
+
+
+.closeBtnFocus
+{
+	upSkin:        Embed('assets/img/3_closeButton.png');
+	overSkin:      Embed('assets/img/3_closeButton.png');
+	downSkin:      Embed('assets/img/3_closeButton.png');
+	disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+.closeBtnNoFocus
+{
+	upSkin:        Embed('assets/img/3_closeButton.png');
+	overSkin:      Embed('assets/img/3_closeButton.png');
+	downSkin:      Embed('assets/img/3_closeButton.png');
+	disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+
+.increaseBtnFocus
+{
+	upSkin:        Embed('assets/img/3_increaseButton.png');
+	overSkin:      Embed('assets/img/3_increaseButton.png');
+	downSkin:      Embed('assets/img/3_increaseButton.png');
+	disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+.increaseBtnNoFocus
+{
+	upSkin:        Embed('assets/img/3_increaseButton.png');
+	overSkin:      Embed('assets/img/3_increaseButton.png');
+	downSkin:      Embed('assets/img/3_increaseButton.png');
+	disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+
+.decreaseBtnFocus 
+{
+	upSkin:        Embed('assets/img/3_decreaseButton.png');
+	overSkin:      Embed('assets/img/3_decreaseButton.png');
+	downSkin:      Embed('assets/img/3_decreaseButton.png');
+	disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+.decreaseBtnNoFocus 
+{
+	upSkin:        Embed('assets/img/3_decreaseButton.png');
+	overSkin:      Embed('assets/img/3_decreaseButton.png');
+	downSkin:      Embed('assets/img/3_decreaseButton.png');
+	disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+
+.minimizeBtnFocus 
+{
+	upSkin:        Embed('assets/img/3_minimizeButton.png');
+	overSkin:      Embed('assets/img/3_minimizeButton.png');
+	downSkin:      Embed('assets/img/3_minimizeButton.png');
+	disabledSkin:  Embed('assets/img/3_minimizeButton.png');
+}
+
+.minimizeBtnNoFocus 
+{
+	upSkin:        Embed('assets/img/3_minimizeButton.png');
+	overSkin:      Embed('assets/img/3_minimizeButton.png');
+	downSkin:      Embed('assets/img/3_minimizeButton.png');
+	disabledSkin:  Embed('assets/img/3_minimizeButton.png');
+}
+
+
+.resizeHndlr 
+{
+	upSkin:        Embed('assets/img/resizeHandler.png');
+	overSkin:      Embed('assets/img/resizeHandler.png');
+	downSkin:      Embed('assets/img/resizeHandler.png');
+	disabledSkin:  Embed('assets/img/resizeHandler.png');
+}
\ No newline at end of file
diff --git a/bigbluebutton-client/src/BigBlueButton.mxml b/bigbluebutton-client/src/BigBlueButton.mxml
index 6fbbe562d0..ec02dad430 100755
--- a/bigbluebutton-client/src/BigBlueButton.mxml
+++ b/bigbluebutton-client/src/BigBlueButton.mxml
@@ -25,12 +25,11 @@
   xmlns:apimap="org.bigbluebutton.main.api.maps.*"
   xmlns:coreMap="org.bigbluebutton.core.controllers.maps.*"
   xmlns:mate="http://mate.asfusion.com/"
-  xmlns:m="library://melomel/2010"
   pageTitle="BigBlueButton" 
   layout="absolute" preinitialize="init()"
   preloader="org.bigbluebutton.main.model.BigBlueButtonPreloader"
   applicationComplete="hotkeyCapture()">
-  
+ 
   <mx:Script>
     <![CDATA[
       import com.asfusion.mate.events.Dispatcher;      
@@ -119,10 +118,10 @@
     }
 
     public function hotkeyCapture():void{
-      LogUtil.debug("Entering hotkeyCapture");
+      trace("Entering hotkeyCapture");
       stage.addEventListener(KeyboardEvent.KEY_DOWN, handleKeyDown);
       ResourceUtil.getInstance().addEventListener(Event.CHANGE, localeChanged); // Listen for locale changing
-      LogUtil.debug("Leaving hotkeyCapture");
+      trace("Leaving hotkeyCapture");
     }
 
     public function handleKeyDown(e:KeyboardEvent) :void
@@ -133,7 +132,7 @@
 
       if (keyCombos[keyPress])
       {
-        LogUtil.debug("Chad keypress " + keyPress);
+        trace("Chad keypress " + keyPress);
         globalDispatcher.dispatchEvent(new ShortcutEvent(keyCombos[keyPress]));
       }
     }
diff --git a/bigbluebutton-client/src/assets/images/delete.png b/bigbluebutton-client/src/assets/images/delete.png
new file mode 100755
index 0000000000..0059eaa72c
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/delete.png differ
diff --git a/bigbluebutton-client/src/assets/images/elipse.png b/bigbluebutton-client/src/assets/images/elipse.png
new file mode 100755
index 0000000000..3252b6aa95
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/elipse.png differ
diff --git a/bigbluebutton-client/src/assets/images/fit-to-screen.png b/bigbluebutton-client/src/assets/images/fit-to-screen.png
new file mode 100755
index 0000000000..0f83d20bed
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/fit-to-screen.png differ
diff --git a/bigbluebutton-client/src/assets/images/fit-to-width.png b/bigbluebutton-client/src/assets/images/fit-to-width.png
new file mode 100755
index 0000000000..12b0527984
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/fit-to-width.png differ
diff --git a/bigbluebutton-client/src/assets/images/hand.png b/bigbluebutton-client/src/assets/images/hand.png
new file mode 100755
index 0000000000..d923194e5e
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/hand.png differ
diff --git a/bigbluebutton-client/src/assets/images/left_arrow.png b/bigbluebutton-client/src/assets/images/left_arrow.png
new file mode 100755
index 0000000000..e6abeb60d4
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/left_arrow.png differ
diff --git a/bigbluebutton-client/src/assets/images/line.png b/bigbluebutton-client/src/assets/images/line.png
new file mode 100755
index 0000000000..175174a0ea
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/line.png differ
diff --git a/bigbluebutton-client/src/assets/images/pencil.png b/bigbluebutton-client/src/assets/images/pencil.png
new file mode 100755
index 0000000000..dd979748ba
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/pencil.png differ
diff --git a/bigbluebutton-client/src/assets/images/right_arrow.png b/bigbluebutton-client/src/assets/images/right_arrow.png
new file mode 100755
index 0000000000..6eab9f047a
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/right_arrow.png differ
diff --git a/bigbluebutton-client/src/assets/images/square.png b/bigbluebutton-client/src/assets/images/square.png
new file mode 100755
index 0000000000..48b5280bdb
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/square.png differ
diff --git a/bigbluebutton-client/src/assets/images/text.png b/bigbluebutton-client/src/assets/images/text.png
new file mode 100755
index 0000000000..21858b8ca4
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/text.png differ
diff --git a/bigbluebutton-client/src/assets/images/triangle.png b/bigbluebutton-client/src/assets/images/triangle.png
new file mode 100755
index 0000000000..f629ee6aeb
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/triangle.png differ
diff --git a/bigbluebutton-client/src/assets/images/undo.png b/bigbluebutton-client/src/assets/images/undo.png
new file mode 100755
index 0000000000..f65e9db3ed
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/undo.png differ
diff --git a/bigbluebutton-client/src/assets/images/upload.png b/bigbluebutton-client/src/assets/images/upload.png
new file mode 100755
index 0000000000..724a094ae6
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/upload.png differ
diff --git a/bigbluebutton-client/src/branding/css/BBBDefault.css b/bigbluebutton-client/src/branding/css/BBBDefault.css
index 7e34fa096a..a7736df2a9 100755
--- a/bigbluebutton-client/src/branding/css/BBBDefault.css
+++ b/bigbluebutton-client/src/branding/css/BBBDefault.css
@@ -3,7 +3,6 @@ Application {
 }
 
 
-
 ApplicationControlBar {
   highlightAlphas: 0.1, 0;
   fillAlphas: 0, 0;
@@ -31,6 +30,16 @@ Panel {
   fontSize: 12;
 }
 
+.whiteboardToolbarStyle {
+  backgroundColor: #CCCCCC;
+  cornerRadius: 5;
+  borderStyle: solid;
+  borderThickness: 1;
+  paddingBottom: 3;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+}
 
 Button {
   textIndent: 0;
@@ -69,3 +78,511 @@ DataGrid {
   fontSize: 12;
 }
 
+
+.whiteboardUndoButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/undo.png');
+}
+
+.whiteboardCircleButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/ellipse.png');  
+}
+
+.whiteboardClearButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/trash.png');    
+}
+
+.whiteboardScribbleButtonStyle{
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/marker.png');  
+}
+
+.whiteboardLineButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/line.png');    
+}
+
+.whiteboardPanZoomButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/hand.png');   
+}
+
+.whiteboardRectangleButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/square.png');   
+}
+
+.whiteboardTextButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/text.png');   
+}
+
+.whiteboardTriangleButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon: Embed('assets/images/triangle.png');    
+}
+
+.presentationUploadButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/upload.png'); 
+}
+
+.presentationBackButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/left-arrow.png'); 
+}
+
+.presentationForwardButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/right-arrow.png'); 
+}
+
+.presentationFitToWidthButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/fit-to-width.png'); 
+}
+
+.presentationFitToPageButtonStyle {
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+  icon:   Embed('assets/images/fit-to-screen.png'); 
+}
+
+.presentationZoomSliderStyle{
+  labelOffset: 0;
+  thumbOffset: 3;
+  dataTipOffset: -1;
+  tickOffset: 2;
+  tickLength: 5;
+  tickThickness: 2;
+  tickColor: #6cccff;
+  showTrackHighlight: true;
+  invertThumbDirection: false;
+  borderColor: #b9babc;
+  trackColors: #aaaaaa, #aaaaaa;
+  themeColor: #aaaaaa;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  labelStyleName: "presentationZoomSliderLabelStyle";
+}
+
+.presentationZoomSliderLabelStyle {
+  color: #5e5f63;
+  fontFamily: Arial;
+}
+
+MDIWindow {
+  resizeCursorHorizontalXOffset: 2;	
+}
+
+.mdiWindowFocus, .mdiWindowNoFocus, .presentationWindowStyleNoFocus, .presentationWindowStyleFocus, .videoDockStyleNoFocus, .videoDockStyleFocus
+{
+  headerHeight: 26;
+  roundedBottomCorners: false;
+  backgroundAlpha: 1;
+  backgroundColor: #b9babc;
+  backgroundSize: '100%';
+  
+  borderStyle: solid;
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThickness: 1;
+  borderThicknessLeft: 1;
+  borderThicknessTop: 1;
+  borderThicknessBottom: 1;
+  borderThicknessRight: 1;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+  
+  cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
+  cornerResizeWidth: 2;
+  cornerResizeHeight: 2;
+  cornerResizePaddingRight: 2;
+  cornerResizePaddingBottom: 2;
+  
+  controlButtonWidth: 10;
+  controlButtonHeight: 10;
+  controlButtonGap: 4;
+}
+
+.presentationSlideViewStyle {
+  backgroundColor: #b9babc;
+}
+
+.presentationWindowControlsStyle {
+  paddingBottom: 5;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+  bottom: 5;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+}
+
+.videoViewStyleNoFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoViewStyleFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoPublishStyleNoFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoPublishStyleFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoAvatarStyleNoFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoAvatarStyleFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.mypanelTitle {
+  color: #5e5f63;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+.closeBtnFocus
+{
+  upSkin:        Embed('assets/img/3_closeButton.png');
+  overSkin:      Embed('assets/img/3_closeButton.png');
+  downSkin:      Embed('assets/img/3_closeButton.png');
+  disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+.closeBtnNoFocus
+{
+  upSkin:        Embed('assets/img/3_closeButton.png');
+  overSkin:      Embed('assets/img/3_closeButton.png');
+  downSkin:      Embed('assets/img/3_closeButton.png');
+  disabledSkin:  Embed('assets/img/3_closeButton.png');
+}
+
+
+.increaseBtnFocus
+{
+  upSkin:        Embed('assets/img/3_increaseButton.png');
+  overSkin:      Embed('assets/img/3_increaseButton.png');
+  downSkin:      Embed('assets/img/3_increaseButton.png');
+  disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+.increaseBtnNoFocus
+{
+  upSkin:        Embed('assets/img/3_increaseButton.png');
+  overSkin:      Embed('assets/img/3_increaseButton.png');
+  downSkin:      Embed('assets/img/3_increaseButton.png');
+  disabledSkin:  Embed('assets/img/3_increaseButton.png');
+}
+
+
+.decreaseBtnFocus 
+{
+  upSkin:        Embed('assets/img/3_decreaseButton.png');
+  overSkin:      Embed('assets/img/3_decreaseButton.png');
+  downSkin:      Embed('assets/img/3_decreaseButton.png');
+  disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+.decreaseBtnNoFocus 
+{
+  upSkin:        Embed('assets/img/3_decreaseButton.png');
+  overSkin:      Embed('assets/img/3_decreaseButton.png');
+  downSkin:      Embed('assets/img/3_decreaseButton.png');
+  disabledSkin:  Embed('assets/img/3_decreaseButton.png');
+}
+
+
+.minimizeBtnFocus 
+{
+  upSkin:        Embed('assets/img/3_minimizeButton.png');
+  overSkin:      Embed('assets/img/3_minimizeButton.png');
+  downSkin:      Embed('assets/img/3_minimizeButton.png');
+  disabledSkin:  Embed('assets/img/3_minimizeButton.png');
+}
+
+
+.resizeHndlr 
+{
+  upSkin:        Embed('assets/img/resizeHandler.png');
+  overSkin:      Embed('assets/img/resizeHandler.png');
+  downSkin:      Embed('assets/img/resizeHandler.png');
+  disabledSkin:  Embed('assets/img/resizeHandler.png');
+}
diff --git a/bigbluebutton-client/src/branding/css/S2S.css b/bigbluebutton-client/src/branding/css/S2S.css
index eb0fbb50ad..524396a456 100755
--- a/bigbluebutton-client/src/branding/css/S2S.css
+++ b/bigbluebutton-client/src/branding/css/S2S.css
@@ -110,6 +110,190 @@ ComboBox {
   themeColor: #999999;
 }
 
+VBox.whiteboardToolbarStyle {
+  backgroundColor: #4798C6;
+  cornerRadius: 5;
+  borderColor: #2D586E;
+  borderStyle: solid;
+  borderThickness: 1;
+  paddingBottom: 3;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+}
+
+Button.whiteboardButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+}
+
+.whiteboardUndoButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/undo.png');
+}
+
+.whiteboardCircleButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/ellipse.png');  
+}
+
+.whiteboardClearButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/trash.png');    
+}
+
+.whiteboardScribbleButtonStyle{
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/marker.png');  
+}
+
+.whiteboardLineButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/line.png');    
+}
+
+.whiteboardPanZoomButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/hand.png');   
+}
+
+.whiteboardRectangleButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/square.png');   
+}
+
+.whiteboardTextButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/text.png');   
+}
+
+.whiteboardTriangleButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon: Embed('assets/images/triangle.png');    
+}
+
+.presentationUploadButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/upload.png'); 
+}
+
+.presentationBackButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/left-arrow.png'); 
+}
+
+.presentationForwardButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/right-arrow.png'); 
+}
+
+.presentationFitToWidthButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/fit-to-width.png'); 
+}
+
+.presentationFitToPageButtonStyle {
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #96c7e6, #50a6d7, #ffffff, #eeeeee;
+  color: #ffffff;
+  textRollOverColor: #ffffff;
+  textSelectedColor: #ffffff;
+  borderColor: #50a6d7;
+  icon:   Embed('assets/images/fit-to-screen.png'); 
+}
+
+.presentationZoomSliderStyle{
+  labelOffset: 0;
+  thumbOffset: 3;
+  dataTipOffset: -1;
+  tickOffset: 2;
+  tickLength: 5;
+  tickThickness: 2;
+  tickColor: #6cccff;
+  showTrackHighlight: true;
+  invertThumbDirection: false;
+  borderColor: #6cccff;
+  trackColors: #6cccff, #6cccff;
+  themeColor: #6cccff;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #6cccff, #6cccff, #6cccff, #6cccff;
+  labelStyleName: "presentationZoomSliderLabelStyle";
+}
+
+.presentationZoomSliderLabelStyle {
+  color: #6cccff;
+  fontFamily: Arial;
+}
+
 MDIWindow {
   resizeCursorHorizontalXOffset: 20	
 }
@@ -176,6 +360,52 @@ MDIWindow {
   controlButtonGap: 4;
 }
 
+.presentationWindowStyleNoFocus 
+{
+  borderColor: #242424;
+  borderAlpha: 1;
+  borderThicknessLeft: 0;
+  borderThicknessTop: 0;
+  borderThicknessBottom: 0;
+  borderThicknessRight: 0;
+  roundedBottomCorners: false;
+  cornerRadius: 0;
+  headerHeight: 0;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.presentationWindowStyleFocus 
+{
+  borderColor: #242424;
+  borderAlpha: 1;
+  borderThicknessLeft: 0;
+  borderThicknessTop: 0;
+  borderThicknessBottom: 0;
+  borderThicknessRight: 0;
+  roundedBottomCorners: false;
+  cornerRadius: 0;
+  headerHeight: 0;
+  backgroundColor: #242424;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.presentationSlideViewStyle {
+  backgroundColor: #003650;
+}
+
+.presentationWindowControlsStyle {
+  paddingBottom: 5;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+  bottom: 5;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+}
+
 .videoDockStyleNoFocus 
 {
   borderColor: #242424;
diff --git a/bigbluebutton-client/src/branding/css/assets/images/BBBlogo.png b/bigbluebutton-client/src/branding/css/assets/images/BBBlogo.png
new file mode 100755
index 0000000000..2e9f8151f4
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/BBBlogo.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/Cursor.png b/bigbluebutton-client/src/branding/css/assets/images/Cursor.png
new file mode 100755
index 0000000000..6e29c43729
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/Cursor.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/add.png b/bigbluebutton-client/src/branding/css/assets/images/add.png
new file mode 100755
index 0000000000..6332fefea4
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/add.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/administrator.gif b/bigbluebutton-client/src/branding/css/assets/images/administrator.gif
new file mode 100755
index 0000000000..608d2d165c
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/administrator.gif differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/application_put.png b/bigbluebutton-client/src/branding/css/assets/images/application_put.png
new file mode 100755
index 0000000000..c30cf59894
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/application_put.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/arrow_in.png b/bigbluebutton-client/src/branding/css/assets/images/arrow_in.png
new file mode 100755
index 0000000000..745c65134d
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/arrow_in.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/arrow_left.png b/bigbluebutton-client/src/branding/css/assets/images/arrow_left.png
new file mode 100755
index 0000000000..56ee138d14
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/arrow_left.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/arrow_out.png b/bigbluebutton-client/src/branding/css/assets/images/arrow_out.png
new file mode 100755
index 0000000000..2e9bc42bec
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/arrow_out.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/arrow_right.png b/bigbluebutton-client/src/branding/css/assets/images/arrow_right.png
new file mode 100755
index 0000000000..f455031232
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/arrow_right.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/arrow_undo.png b/bigbluebutton-client/src/branding/css/assets/images/arrow_undo.png
new file mode 100755
index 0000000000..e0f8038cff
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/arrow_undo.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/blank-circle.png b/bigbluebutton-client/src/branding/css/assets/images/blank-circle.png
new file mode 100755
index 0000000000..f3b2a1360a
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/blank-circle.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/bullet_go.png b/bigbluebutton-client/src/branding/css/assets/images/bullet_go.png
new file mode 100755
index 0000000000..bc4faa709e
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/bullet_go.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/cancel.png b/bigbluebutton-client/src/branding/css/assets/images/cancel.png
new file mode 100755
index 0000000000..3950faf59d
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/cancel.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/circle.png b/bigbluebutton-client/src/branding/css/assets/images/circle.png
new file mode 100755
index 0000000000..06e7ffa986
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/circle.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/control_play_blue.png b/bigbluebutton-client/src/branding/css/assets/images/control_play_blue.png
new file mode 100755
index 0000000000..f8c8ec683e
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/control_play_blue.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/deskshare_icon.png b/bigbluebutton-client/src/branding/css/assets/images/deskshare_icon.png
new file mode 100755
index 0000000000..e9065faaf0
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/deskshare_icon.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/ellipse.png b/bigbluebutton-client/src/branding/css/assets/images/ellipse.png
new file mode 100755
index 0000000000..ce5466bfe0
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/ellipse.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/fit-to-screen.png b/bigbluebutton-client/src/branding/css/assets/images/fit-to-screen.png
new file mode 100755
index 0000000000..fe28c01d24
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/fit-to-screen.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/fit-to-width.png b/bigbluebutton-client/src/branding/css/assets/images/fit-to-width.png
new file mode 100755
index 0000000000..f991166ed6
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/fit-to-width.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/forward_blue.png b/bigbluebutton-client/src/branding/css/assets/images/forward_blue.png
new file mode 100755
index 0000000000..4a2f9d4e4a
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/forward_blue.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/green-circle.png b/bigbluebutton-client/src/branding/css/assets/images/green-circle.png
new file mode 100755
index 0000000000..08f8b8c25a
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/green-circle.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/hand.png b/bigbluebutton-client/src/branding/css/assets/images/hand.png
new file mode 100755
index 0000000000..c6bcefaea0
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/hand.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/icons-license.txt b/bigbluebutton-client/src/branding/css/assets/images/icons-license.txt
new file mode 100755
index 0000000000..9f25609678
--- /dev/null
+++ b/bigbluebutton-client/src/branding/css/assets/images/icons-license.txt
@@ -0,0 +1,38 @@
+Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com
+
+==================================================
+Diagona Icons
+
+Copyright (C) 2007 Yusuke Kamiyamane. All rights reserved.
+The icons are licensed under a Creative Commons Attribution
+3.0 license. <http://creativecommons.org/licenses/by/3.0/>
+
+If you can't or don't want to provide a link back, please
+purchase a royalty-free license.
+<http://p.yusukekamiyamane.com/>
+
+I'm unavailable for custom icon design work. But your
+suggestions are always welcome!
+<mailto:p@yusukekamiyamane.com>
+====================
\ No newline at end of file
diff --git a/bigbluebutton-client/src/branding/css/assets/images/left-arrow.png b/bigbluebutton-client/src/branding/css/assets/images/left-arrow.png
new file mode 100755
index 0000000000..3117136c1f
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/left-arrow.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/line.png b/bigbluebutton-client/src/branding/css/assets/images/line.png
new file mode 100755
index 0000000000..e0abedeaae
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/line.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/lock.png b/bigbluebutton-client/src/branding/css/assets/images/lock.png
new file mode 100755
index 0000000000..ff45911300
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/lock.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/lock_close.png b/bigbluebutton-client/src/branding/css/assets/images/lock_close.png
new file mode 100755
index 0000000000..2ebc4f6f96
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/lock_close.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/lock_open.png b/bigbluebutton-client/src/branding/css/assets/images/lock_open.png
new file mode 100755
index 0000000000..a471765ff1
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/lock_open.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/magnifier.png b/bigbluebutton-client/src/branding/css/assets/images/magnifier.png
new file mode 100755
index 0000000000..415b81f589
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/magnifier.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/magnifier_reset.png b/bigbluebutton-client/src/branding/css/assets/images/magnifier_reset.png
new file mode 100755
index 0000000000..7f9d1f10fe
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/magnifier_reset.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/marker.png b/bigbluebutton-client/src/branding/css/assets/images/marker.png
new file mode 100755
index 0000000000..7a026099e3
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/marker.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/page_white_get.png b/bigbluebutton-client/src/branding/css/assets/images/page_white_get.png
new file mode 100755
index 0000000000..5e3c3db492
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/page_white_get.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/participant-mute.png b/bigbluebutton-client/src/branding/css/assets/images/participant-mute.png
new file mode 100755
index 0000000000..57b6320479
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/participant-mute.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/participant.gif b/bigbluebutton-client/src/branding/css/assets/images/participant.gif
new file mode 100755
index 0000000000..d307b20068
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/participant.gif differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/pencil.png b/bigbluebutton-client/src/branding/css/assets/images/pencil.png
new file mode 100755
index 0000000000..b24e7d15e6
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/pencil.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/presenter.png b/bigbluebutton-client/src/branding/css/assets/images/presenter.png
new file mode 100755
index 0000000000..c1974cda74
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/presenter.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/raisehand.png b/bigbluebutton-client/src/branding/css/assets/images/raisehand.png
new file mode 100755
index 0000000000..edc8fdc463
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/raisehand.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/red-circle.png b/bigbluebutton-client/src/branding/css/assets/images/red-circle.png
new file mode 100755
index 0000000000..1c500ba34e
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/red-circle.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/right-arrow.png b/bigbluebutton-client/src/branding/css/assets/images/right-arrow.png
new file mode 100755
index 0000000000..f00775a7ea
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/right-arrow.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/settings.png b/bigbluebutton-client/src/branding/css/assets/images/settings.png
new file mode 100755
index 0000000000..92692173f2
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/settings.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/shape_handles.png b/bigbluebutton-client/src/branding/css/assets/images/shape_handles.png
new file mode 100755
index 0000000000..ce27fe3a03
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/shape_handles.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/shape_move_front.png b/bigbluebutton-client/src/branding/css/assets/images/shape_move_front.png
new file mode 100755
index 0000000000..b4a4e3b785
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/shape_move_front.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/shape_square.png b/bigbluebutton-client/src/branding/css/assets/images/shape_square.png
new file mode 100755
index 0000000000..f365749181
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/shape_square.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/sound.png b/bigbluebutton-client/src/branding/css/assets/images/sound.png
new file mode 100755
index 0000000000..6056d234a9
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/sound.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/sound_mute.png b/bigbluebutton-client/src/branding/css/assets/images/sound_mute.png
new file mode 100755
index 0000000000..b652d2a71f
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/sound_mute.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/sound_none.png b/bigbluebutton-client/src/branding/css/assets/images/sound_none.png
new file mode 100755
index 0000000000..a229352925
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/sound_none.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/square.png b/bigbluebutton-client/src/branding/css/assets/images/square.png
new file mode 100755
index 0000000000..bdceb2e474
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/square.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/table.png b/bigbluebutton-client/src/branding/css/assets/images/table.png
new file mode 100755
index 0000000000..abcd93689a
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/table.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/text.png b/bigbluebutton-client/src/branding/css/assets/images/text.png
new file mode 100755
index 0000000000..819b580392
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/text.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/trash.png b/bigbluebutton-client/src/branding/css/assets/images/trash.png
new file mode 100755
index 0000000000..2b95a3faa6
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/trash.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/triangle.png b/bigbluebutton-client/src/branding/css/assets/images/triangle.png
new file mode 100755
index 0000000000..0530c3deb6
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/triangle.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/undo.png b/bigbluebutton-client/src/branding/css/assets/images/undo.png
new file mode 100755
index 0000000000..43a7e19fc6
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/undo.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/unlock.png b/bigbluebutton-client/src/branding/css/assets/images/unlock.png
new file mode 100755
index 0000000000..7177da02e7
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/unlock.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/upload.png b/bigbluebutton-client/src/branding/css/assets/images/upload.png
new file mode 100755
index 0000000000..030cc3e82a
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/upload.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/user.png b/bigbluebutton-client/src/branding/css/assets/images/user.png
new file mode 100755
index 0000000000..79f35ccbda
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/user.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/user_go.png b/bigbluebutton-client/src/branding/css/assets/images/user_go.png
new file mode 100755
index 0000000000..0468cf08f3
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/user_go.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/user_gray.png b/bigbluebutton-client/src/branding/css/assets/images/user_gray.png
new file mode 100755
index 0000000000..8fd539e9cb
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/user_gray.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/user_green.png b/bigbluebutton-client/src/branding/css/assets/images/user_green.png
new file mode 100755
index 0000000000..30383c2de5
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/user_green.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/user_orange.png b/bigbluebutton-client/src/branding/css/assets/images/user_orange.png
new file mode 100755
index 0000000000..b818127df6
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/user_orange.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/user_red.png b/bigbluebutton-client/src/branding/css/assets/images/user_red.png
new file mode 100755
index 0000000000..c6f66e8b30
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/user_red.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/webcam.png b/bigbluebutton-client/src/branding/css/assets/images/webcam.png
new file mode 100755
index 0000000000..af71c30610
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/webcam.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/whiteboard_icon.png b/bigbluebutton-client/src/branding/css/assets/images/whiteboard_icon.png
new file mode 100755
index 0000000000..aee99fc0c7
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/whiteboard_icon.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/whiteboard_thick.png b/bigbluebutton-client/src/branding/css/assets/images/whiteboard_thick.png
new file mode 100755
index 0000000000..bff4086240
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/whiteboard_thick.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/images/whiteboard_thin.png b/bigbluebutton-client/src/branding/css/assets/images/whiteboard_thin.png
new file mode 100755
index 0000000000..2967c92434
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/images/whiteboard_thin.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/add.png b/bigbluebutton-client/src/branding/css/assets/img/add.png
new file mode 100755
index 0000000000..6332fefea4
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/add.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/administrator.gif b/bigbluebutton-client/src/branding/css/assets/img/administrator.gif
new file mode 100755
index 0000000000..608d2d165c
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/administrator.gif differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/annotation.png b/bigbluebutton-client/src/branding/css/assets/img/annotation.png
new file mode 100755
index 0000000000..fb7cb8e9e7
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/annotation.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/application_put.png b/bigbluebutton-client/src/branding/css/assets/img/application_put.png
new file mode 100755
index 0000000000..c30cf59894
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/application_put.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/arrow_in.png b/bigbluebutton-client/src/branding/css/assets/img/arrow_in.png
new file mode 100755
index 0000000000..745c65134d
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/arrow_in.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/arrow_left.png b/bigbluebutton-client/src/branding/css/assets/img/arrow_left.png
new file mode 100755
index 0000000000..56ee138d14
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/arrow_left.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/arrow_out.png b/bigbluebutton-client/src/branding/css/assets/img/arrow_out.png
new file mode 100755
index 0000000000..2e9bc42bec
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/arrow_out.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/arrow_right.png b/bigbluebutton-client/src/branding/css/assets/img/arrow_right.png
new file mode 100755
index 0000000000..f455031232
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/arrow_right.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/arrow_undo.png b/bigbluebutton-client/src/branding/css/assets/img/arrow_undo.png
new file mode 100755
index 0000000000..e0f8038cff
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/arrow_undo.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/avatar.png b/bigbluebutton-client/src/branding/css/assets/img/avatar.png
new file mode 100755
index 0000000000..2e9f8151f4
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/avatar.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/bandwidth.png b/bigbluebutton-client/src/branding/css/assets/img/bandwidth.png
new file mode 100755
index 0000000000..adb979ce5a
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/bandwidth.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/mic_unmuted.png b/bigbluebutton-client/src/branding/css/assets/img/mic_unmuted.png
new file mode 100755
index 0000000000..d5b65fc7ef
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/mic_unmuted.png differ
diff --git a/bigbluebutton-client/src/branding/css/assets/img/sound.png b/bigbluebutton-client/src/branding/css/assets/img/sound.png
new file mode 100755
index 0000000000..6056d234a9
Binary files /dev/null and b/bigbluebutton-client/src/branding/css/assets/img/sound.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as
index 45d2a584bb..01e6720778 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as
@@ -118,7 +118,7 @@ package org.bigbluebutton.common
         public var sound:Class;                
 
         [Embed(source="assets/images/cancel.png")]
-        public var cancel_user:Class;    
+        public var cancel:Class;    
 
         [Embed(source="assets/images/user_go.png")]
         public var eject_user:Class;  
@@ -135,19 +135,19 @@ package org.bigbluebutton.common
         [Embed(source="assets/images/shape_square.png")]
         public var square_icon:Class;  
         
-        [Embed(source="assets/images/arrow_undo.png")] 
+        [Embed(source="assets/images/undo.png")] 
         public var undo_icon:Class;  
         
-        [Embed(source="assets/images/hand_icon.png")]
+        [Embed(source="assets/images/hand.png")]
         public var hand_icon:Class; 
         
-        [Embed(source="assets/images/scribble_icon.png")]
+        [Embed(source="assets/images/marker.png")]
         public var scribble_icon:Class; 
 
-        [Embed(source="assets/images/text_icon.png")]
+        [Embed(source="assets/images/text.png")]
         public var text_icon:Class; 
         
-        [Embed(source="assets/images/circle.png")]
+        [Embed(source="assets/images/ellipse.png")]
         public var circle_icon:Class; 
         
         [Embed(source="assets/images/arrow_out.png")]
@@ -171,7 +171,7 @@ package org.bigbluebutton.common
 		[Embed(source="assets/images/table.png")]
 		public var table:Class; 
 		
-		[Embed(source="assets/images/cancel.png")]
+		[Embed(source="assets/images/trash.png")]
 		public var delete_icon:Class; 
 
         [Embed(source="assets/images/arrow_right.png")]
@@ -250,7 +250,7 @@ package org.bigbluebutton.common
 		[Embed(source="assets/images/pointer_icon_small.png")]
 		public var select_icon:Class;	
 		
-		[Embed(source="assets/images/triangle_icon.png")]
+		[Embed(source="assets/images/triangle.png")]
 		public var triangle_icon:Class;	
 		
 		[Embed(source="assets/images/text_background_icon.png")]
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png
new file mode 100755
index 0000000000..ce5466bfe0
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-screen.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-screen.png
new file mode 100755
index 0000000000..fe28c01d24
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-screen.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-width.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-width.png
index 39d6e1dd44..f991166ed6 100755
Binary files a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-width.png and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-width.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/hand.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/hand.png
new file mode 100755
index 0000000000..c6bcefaea0
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/hand.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/left_arrow.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/left_arrow.png
new file mode 100755
index 0000000000..3117136c1f
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/left_arrow.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png
old mode 100644
new mode 100755
index f5413cb7bf..e0abedeaae
Binary files a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/marker.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/marker.png
new file mode 100755
index 0000000000..7a026099e3
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/marker.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/righ-arrow.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/righ-arrow.png
new file mode 100755
index 0000000000..f00775a7ea
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/righ-arrow.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/square.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/square.png
new file mode 100755
index 0000000000..bdceb2e474
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/square.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png
new file mode 100755
index 0000000000..819b580392
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/trash.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/trash.png
new file mode 100755
index 0000000000..2b95a3faa6
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/trash.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle.png
new file mode 100755
index 0000000000..0530c3deb6
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/undo.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/undo.png
new file mode 100755
index 0000000000..43a7e19fc6
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/undo.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/upload.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/upload.png
index 36086b0525..030cc3e82a 100755
Binary files a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/upload.png and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/upload.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
index 6538a5236b..fdc02cea62 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
@@ -24,7 +24,7 @@
 			private var mic:Microphone;
 			private var playingAudio:Boolean = false;
 			private var images:Images = new Images();
-			[Bindable] private var cancelIcon:Class = images.delete_icon;
+			[Bindable] private var cancelIcon:Class = images.cancel;
 			
 			private function initDefaultMic():void {
 				mic = Microphone.getMicrophone();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
index d6d81d4f84..b9a86b82aa 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
@@ -41,7 +41,7 @@
 			[Bindable] private var muteIcon:Class = images.sound_mute;
 			[Bindable] private var unmuteIcon:Class = images.sound_none;
 			[Bindable] private var talkIcon:Object = images.sound;   		
-			[Bindable] private var ejectIcon:Class = images.delete_icon;
+			[Bindable] private var ejectIcon:Class = images.cancel;
 			[Bindable] private var statusTooltip : String = "";
 			[Bindable] private var ejectTooltip : String = ResourceUtil.getInstance().getString('bbb.listeners.ejectTooltip');
 			[Bindable] private var moderator:Boolean = false;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
index dd8dd14802..d0a9151e56 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
@@ -65,7 +65,7 @@
 			private var images:Images = new Images();
 			[Bindable] private var addIcon : Class = images.add;
 			[Bindable] private var bulletGoIcon : Class = images.bulletGo;
-			[Bindable] private var deleteIcon : Class = images.delete_icon;
+			[Bindable] private var deleteIcon : Class = images.cancel;
 	        
 	        private var thumbnailTimer:Timer = new Timer(5000);
 	        private var genThumbText:String = ResourceUtil.getInstance().getString('bbb.fileupload.genThumbText');
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
index 4e8c78f8aa..28b5546dbd 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -27,12 +27,12 @@
 	xmlns:code="http://code.google.com/p/flexlib/" 
 	xmlns:containers="flexlib.containers.*"
 	xmlns:mate="http://mate.asfusion.com/"
-	paddingBottom="0" paddingTop="0" paddingLeft="0" paddingRight="0" 
 	showCloseButton="false" layout="absolute"
 	verticalScrollPolicy="off" 
 	horizontalScrollPolicy="off" 
 	showControls="true" resize="maximizeHandler()"
-	backgroundColor="#efefef"
+  styleNameFocus="presentationWindowStyleFocus"
+  styleNameNoFocus="presentationWindowStyleNoFocus"
 	implements="org.bigbluebutton.common.IBbbModuleWindow"
 	creationComplete="onCreationComplete()" 
 	width="{DEFAULT_WINDOW_WIDTH}" height="{DEFAULT_WINDOW_HEIGHT}" 
@@ -55,11 +55,9 @@
 	
 	<mx:Script>
 		<![CDATA[
-			import flash.geom.Point;
-			
+			import flash.geom.Point;			
 			import flexlib.containers.DockableToolBar;
-			import flexlib.mdi.events.MDIWindowEvent;
-			
+			import flexlib.mdi.events.MDIWindowEvent;			
 			import mx.binding.utils.BindingUtils;
 			import mx.collections.ArrayCollection;
 			import mx.containers.TitleWindow;
@@ -68,8 +66,7 @@
 			import mx.events.ListEvent;
 			import mx.events.ResizeEvent;
 			import mx.managers.PopUpManager;
-			import mx.rpc.events.*;
-			
+			import mx.rpc.events.*;			
 			import org.bigbluebutton.common.IBbbCanvas;
 			import org.bigbluebutton.common.Images;
 			import org.bigbluebutton.common.LogUtil;
@@ -93,21 +90,13 @@
 			import org.bigbluebutton.modules.present.managers.SlideManager;
 			import org.bigbluebutton.util.i18n.ResourceUtil;
              			
-            public static const TITLE:String = "Presentation";
+      public static const TITLE:String = "Presentation";
 			private static const NEXT_BUTTON:String = "Next";
 			private static const PREVIOUS_BUTTON:String = "Previous";
-			private static const GOTO_PAGE_BUTTON:String = "Go to Page..."
-			
-			private var images:Images = new Images();
-
-			[Bindable] private var uploadIcon:Class = images.upload;
-			[Bindable] private var forwardIcon:Class = images.forward;
-			[Bindable] private var backwardIcon:Class = images.backward;
-			[Bindable] private var magnifierIcon:Class = images.magnifier;
-			[Bindable] public var fitToWidthIcon:Class = images.fitToWidth;
-			[Bindable] public var fitToPageIcon:Class = images.fitToPage;
+			private static const GOTO_PAGE_BUTTON:String = "Go to Page...";
 						
-			[Bindable] private var thumbY:Number;
+			[Bindable] 
+      private var thumbY:Number;
 			public var uploadWindow:FileUploadWindow = null;
 			private var slideManager:SlideManager = new SlideManager();
 			private var pageDialog:GotoPageDialog;
@@ -496,6 +485,10 @@
 				slideView.switchToFitToPage(fitToPage);
 				fitSlideToWindowMaintainingAspectRatio();				
 			}
+      
+      private function onUploadButtonClicked():void {
+        dispatchEvent(new UploadEvent(UploadEvent.OPEN_UPLOAD_WINDOW));
+      }
 			          
 		]]>
 	</mx:Script>
@@ -503,32 +496,32 @@
 	<mx:Fade id="thumbFadeIn" alphaFrom="1" alphaTo="0" duration="100" />
 	<mx:Fade id="thumbFadeOut" alphaFrom="0" alphaTo="1" duration="100" />
 
-	<views:SlideView id="slideView" width="100%" height="100%" visible="false" mouseDown="mouseDown = true" backgroundColor="#efefef"
+	<views:SlideView id="slideView" width="100%" height="100%" visible="false" mouseDown="mouseDown = true"
 			 mouseUp="mouseDown = false" verticalScrollPolicy="off" horizontalScrollPolicy="off" />			    
-    <mx:ApplicationControlBar id="presCtrlBar" width="100%" height="{CONTROL_BAR_HEIGHT}">
-    	  <mx:Button id="uploadPres" icon="{uploadIcon}" visible="false" width="25" height="25"
+  <mx:ControlBar id="presCtrlBar" width="100%" height="{CONTROL_BAR_HEIGHT}" styleName="presentationWindowControlsStyle" >
+    	  <mx:Button id="uploadPres" visible="false" width="25" height="25" styleName="presentationUploadButtonStyle"
     	   		toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.uploadPresBtn.toolTip')}" 
-    	   		click="dispatchEvent(new UploadEvent(UploadEvent.OPEN_UPLOAD_WINDOW))"/>        	  
+    	   		click="onUploadButtonClicked()"/>        	  
     	  <mx:Spacer width="50%" id="spacer1"/>
-    	  <mx:Button id="backButton" icon="{backwardIcon}" visible="false" width="30" height="20"
+    	  <mx:Button id="backButton" visible="false" width="30" height="20" styleName="presentationBackButtonStyle"
     	   		toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.backBtn.toolTip')}" click="gotoPreviousSlide()"/>
     	  <mx:Button id="btnSlideNum" visible="false" label="" click="showThumbnails()" doubleClick="showPageDialog()" 
 					 toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.slideNumLbl.toolTip')}"/>
-    	  <mx:Button id="forwardButton" icon="{forwardIcon}" visible="false" width="30" height="20"
+    	  <mx:Button id="forwardButton" visible="false" width="30" height="20" styleName="presentationForwardButtonStyle"
     	   		toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.forwardBtn.toolTip')}" click="gotoNextSlide()"/>    				
 		<mx:Spacer width="10%" id="spacer2"/>
     	 
-		<mx:HSlider id="zoomSlider" visible="false" value="{slideView.zoomPercentage}"
+		<mx:HSlider id="zoomSlider" visible="false" value="{slideView.zoomPercentage}" styleName="presentationZoomSliderStyle"
     		minimum="100" maximum="400" dataTipPlacement="top" labels="['100%','400%']" 
     		useHandCursor="true" snapInterval="5" allowTrackClick="true" liveDragging="true" 
     		dataTipFormatFunction="removeDecimalFromDataTip" change="onSliderZoom()" width="100"/>
     	<mx:Spacer width="50%" id="spacer3"/>
-    	<mx:Button id="btnFitToWidth" icon="{fitToWidthIcon}" visible="false" width="25" height="25" 
+    	<mx:Button id="btnFitToWidth" visible="false" width="25" height="25" styleName="presentationFitToWidthButtonStyle"
 				   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.fitToWidth.toolTip')}" 
 				   click="onFitToPage(false)"/>
-		<mx:Button id="btnFitToPage" icon="{fitToPageIcon}" visible="false" width="25" height="25" 
+		<mx:Button id="btnFitToPage" visible="false" width="25" height="25" styleName="presentationFitToPageButtonStyle"
 				   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.fitToPage.toolTip')}" 
 				   click="onFitToPage(true)"/>
     	<mx:Spacer width="5" id="spacer4"/>
-    </mx:ApplicationControlBar>
+    </mx:ControlBar>
 </pres:MDIWindow>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
index f29cb3915c..c737579e7d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
@@ -29,7 +29,7 @@
     creationComplete="onCreationComplete()" 
 	verticalScrollPolicy="off" 
 	horizontalScrollPolicy="off"      
-    rollOut="hideCursor()"
+    rollOut="hideCursor()" styleName="presentationSlideViewStyle"
     xmlns:views="org.bigbluebutton.modules.present.views.*"
     implements="org.bigbluebutton.common.IBbbCanvas">
     
@@ -487,7 +487,7 @@
 		]]>
 	</mx:Script>
 	<fimage:FocusableImage id="slideLoader" width="{slideModel.loaderW}" height="{slideModel.loaderH}" x="{slideModel.loaderX}" y="{slideModel.loaderY}" useHandCursor="true" buttonMode="true"
-		creationComplete="listenForSlideLoadedCompleteEvent()" scaleContent="false" showBusyCursor="true" completeEffect="Fade" />
+		creationComplete="listenForSlideLoadedCompleteEvent()" styleName="presentationSlideViewStyle" scaleContent="false" showBusyCursor="true" completeEffect="Fade" />
 	
    		
     <mx:HorizontalList id="thumbnailView" itemRenderer="org.bigbluebutton.modules.present.ui.views.Thumbnail" itemRollOver="changeIndex(event)" 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/StatusItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/StatusItemRenderer.mxml
index ee77c1758e..0aba9ab792 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/StatusItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/StatusItemRenderer.mxml
@@ -49,7 +49,7 @@
       import org.bigbluebutton.util.i18n.ResourceUtil;
 			
 			private var images:Images = new Images();
-			[Bindable] public var kickIcon:Class = images.delete_icon;
+			[Bindable] public var kickIcon:Class = images.cancel;
 			
 			private var isModerator:Boolean = false;
 			private var allowKickUser:Boolean = false;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
index 8459a14a72..1b8d9397f9 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
@@ -25,8 +25,7 @@
 		xmlns:view="org.bigbluebutton.modules.whiteboard.views.*"
 		xmlns:wbBtns="org.bigbluebutton.modules.whiteboard.views.buttons.*"
 		xmlns:mate="http://mate.asfusion.com/" creationComplete="onCreationComplete()"
-		visible="true" backgroundColor="0xCCCCCC" cornerRadius="5" borderStyle="solid" 
-	    paddingBottom="3" paddingTop="3" paddingLeft="3" paddingRight="3" >
+		visible="true" styleName="whiteboardToolbarStyle">
 	
 	<mate:Listener type="{MadePresenterEvent.SWITCH_TO_PRESENTER_MODE}" method="presenterMode" />
 	<mate:Listener type="{MadePresenterEvent.SWITCH_TO_VIEWER_MODE}" method="viewerMode" />
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/CircleButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/CircleButton.mxml
index 04c46c32a4..a625c64b51 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/CircleButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/CircleButton.mxml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml"
 		   width="20" height="20" 
-		   click="onClick()" 
-		   icon="{ellipse_icon}" 
+		   click="onClick()" styleName="whiteboardCircleButtonStyle"
 		   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.ellipse')}" 
 		   toggle="true">
 	<mx:Script>
@@ -12,10 +11,7 @@
 			import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
 			import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
 			import org.bigbluebutton.util.i18n.ResourceUtil;
-			
-			private var images:Images = new Images();			
-			[Bindable] private var ellipse_icon:Class = images.circle_icon;
-			
+						
 			private function onClick():void {
 				var event:WhiteboardButtonEvent = new WhiteboardButtonEvent(WhiteboardButtonEvent.WHITEBOARD_BUTTON_PRESSED);
 				event.graphicType = WhiteboardConstants.TYPE_SHAPE;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
index dd666c2301..7ab2e77969 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml"
-		   width="20" height="20" click="onClick()" icon="{delete_icon}" 
+		   width="20" height="20" click="onClick()" styleName="whiteboardClearButtonStyle"
 		   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.clear')}">
 	<mx:Script>
 		<![CDATA[
-            import org.bigbluebutton.common.Images;
             import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
             import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
             import org.bigbluebutton.util.i18n.ResourceUtil;
-			
-			private var images:Images = new Images();
-			[Bindable] private var delete_icon:Class = images.delete_icon;
-			
+						
             private function onClick():void {
                 var event:WhiteboardButtonEvent = new WhiteboardButtonEvent(WhiteboardButtonEvent.WHITEBOARD_BUTTON_PRESSED);
                 event.graphicType = WhiteboardConstants.TYPE_CLEAR;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/LineButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/LineButton.mxml
index f6334b33bb..ff1a09d139 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/LineButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/LineButton.mxml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml"
-		   width="20" height="20" click="onClick()" icon="{line_icon}" 
+		   width="20" height="20" click="onClick()" styleName="whiteboardLineButtonStyle"
 		   toolTip="{ResourceUtil.getInstance().getString('ltbcustom.bbb.highlighter.toolbar.line')}" toggle="true">
 	<mx:Script>
 		<![CDATA[
-            import org.bigbluebutton.common.Images;
             import org.bigbluebutton.modules.whiteboard.business.shapes.DrawObject;
             import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
             import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
             import org.bigbluebutton.util.i18n.ResourceUtil;
-			
-			private var images:Images = new Images();
-			[Bindable] private var line_icon:Class = images.line_icon;
-			
+						
             private function onClick():void {
                 var event:WhiteboardButtonEvent = new WhiteboardButtonEvent(WhiteboardButtonEvent.WHITEBOARD_BUTTON_PRESSED);
                 event.graphicType = WhiteboardConstants.TYPE_SHAPE;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/PanZoomButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/PanZoomButton.mxml
index af859c7308..3edc883f42 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/PanZoomButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/PanZoomButton.mxml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml"
-		   width="20" height="20" click="onClick()" icon="{hand_icon}" 
+		   width="20" height="20" click="onClick()" styleName="whiteboardPanZoomButtonStyle"
 		   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.panzoom')}" toggle="true">
 	<mx:Script>
 		<![CDATA[
-            import org.bigbluebutton.common.Images;
             import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
             import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
             import org.bigbluebutton.util.i18n.ResourceUtil;
-			
-			private var images:Images = new Images();
-			
-			[Bindable] private var hand_icon:Class = images.hand_icon;
-			
+						
             private function onClick():void {
                 var event:WhiteboardButtonEvent = new WhiteboardButtonEvent(WhiteboardButtonEvent.WHITEBOARD_BUTTON_PRESSED);
                 event.graphicType = WhiteboardConstants.TYPE_ZOOM;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/RectangleButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/RectangleButton.mxml
index 8d17ffa9da..0793cff2cb 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/RectangleButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/RectangleButton.mxml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml"
 		   width="20" height="20"
-		   click="onClick()" 
-		   icon="{rectangle_icon}" toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.rectangle')}" toggle="true">
+		   click="onClick()" styleName="whiteboardRectangleButtonStyle"
+		   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.rectangle')}" toggle="true">
 	<mx:Script>
 		<![CDATA[
-            import org.bigbluebutton.common.Images;
             import org.bigbluebutton.modules.whiteboard.business.shapes.DrawObject;
             import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
             import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
             import org.bigbluebutton.util.i18n.ResourceUtil;
-			
-			private var images:Images = new Images();
-			[Bindable] private var rectangle_icon:Class = images.square_icon;
-			
+				
             private function onClick():void {
                 var event:WhiteboardButtonEvent = new WhiteboardButtonEvent(WhiteboardButtonEvent.WHITEBOARD_BUTTON_PRESSED);
                 event.graphicType = WhiteboardConstants.TYPE_SHAPE;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ScribbleButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ScribbleButton.mxml
index 97f7fd2d32..6caa2d10de 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ScribbleButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ScribbleButton.mxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml"
-		   width="20" height="20" click="onClick()"  
-		   icon="{scribble_icon}" toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.pencil')}" 
+		   width="20" height="20" click="onClick()"  styleName="whiteboardScribbleButtonStyle"
+		   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.pencil')}" 
 		   toggle="true" selected="true">
 	<mx:Script>
 		<![CDATA[
@@ -10,11 +10,7 @@
             import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
             import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
             import org.bigbluebutton.util.i18n.ResourceUtil;
-			
-			private var images:Images = new Images();
-			
-			[Bindable] private var scribble_icon:Class = images.scribble_icon;
-			
+						
             private function onClick():void {
                 var event:WhiteboardButtonEvent = new WhiteboardButtonEvent(WhiteboardButtonEvent.WHITEBOARD_BUTTON_PRESSED);
                 event.graphicType = WhiteboardConstants.TYPE_SHAPE;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TextButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TextButton.mxml
index c0f7e59f8e..e5aaf6d671 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TextButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TextButton.mxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml"
-		   width="20" height="20" click="onClick()" icon="{text_icon}" 
+		   width="20" height="20" click="onClick()" styleName="whiteboardTextButtonStyle"
 		   toolTip="{ResourceUtil.getInstance().getString('ltbcustom.bbb.highlighter.toolbar.text')}" toggle="true">
 	<mx:Script>
 		<![CDATA[
@@ -8,10 +8,7 @@
             import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
             import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
             import org.bigbluebutton.util.i18n.ResourceUtil;
-			
-			private var images:Images = new Images();
-			[Bindable] private var text_icon:Class = images.text_icon;
-			
+						
             private function onClick():void {
                 var event:WhiteboardButtonEvent = new WhiteboardButtonEvent(WhiteboardButtonEvent.WHITEBOARD_BUTTON_PRESSED);
                 event.graphicType = WhiteboardConstants.TYPE_TEXT;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TriangleButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TriangleButton.mxml
index 0a603f1ac4..b2f91565aa 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TriangleButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TriangleButton.mxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml"
-		   width="20" height="20" click="onClick()" icon="{triangle_icon}" 
+		   width="20" height="20" click="onClick()" styleName="whiteboardTriangleButtonStyle"
 		   toolTip="{ResourceUtil.getInstance().getString('ltbcustom.bbb.highlighter.toolbar.triangle')}" 
 		   toggle="true">
 	<mx:Script>
@@ -10,10 +10,7 @@
             import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
             import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
             import org.bigbluebutton.util.i18n.ResourceUtil;
-			
-			private var images:Images = new Images();
-			[Bindable] private var triangle_icon:Class = images.triangle_icon;
-			
+					
             private function onClick():void {
                 var event:WhiteboardButtonEvent = new WhiteboardButtonEvent(WhiteboardButtonEvent.WHITEBOARD_BUTTON_PRESSED);
                 event.graphicType = WhiteboardConstants.TYPE_SHAPE;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/UndoButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/UndoButton.mxml
index 3473249845..55d7f5c8f3 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/UndoButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/UndoButton.mxml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml"
-		   width="20" height="20" click="onClick()" icon="{undo_icon}" 
+		   width="20" height="20" click="onClick()" styleName="whiteboardUndoButtonStyle"
 		   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.undo')}">
 	<mx:Script>
 		<![CDATA[
-            import org.bigbluebutton.common.Images;
+
             import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants;
             import org.bigbluebutton.modules.whiteboard.events.WhiteboardButtonEvent;
             import org.bigbluebutton.util.i18n.ResourceUtil;
-			
-			private var images:Images = new Images();
-			[Bindable] private var undo_icon:Class = images.undo_icon;
-			
+						
             private function onClick():void {
                 var event:WhiteboardButtonEvent = new WhiteboardButtonEvent(WhiteboardButtonEvent.WHITEBOARD_BUTTON_PRESSED);
                 event.graphicType = WhiteboardConstants.TYPE_UNDO;