Index: bp-core.php
===================================================================
--- bp-core.php	(revision 3015)
+++ bp-core.php	(working copy)
@@ -1804,7 +1804,7 @@
 		add_action( $hookname, $function );
 
 	if ( empty($icon_url) )
-		$icon_url = 'images/generic.png';
+		$icon_url = 'div';
 	elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
 		$icon_url = 'https://' . substr($icon_url, 7);
 
Index: bp-core/admin/bp-core-admin.php
===================================================================
--- bp-core/admin/bp-core-admin.php	(revision 3015)
+++ bp-core/admin/bp-core-admin.php	(working copy)
@@ -49,6 +49,8 @@
 
 	<div class="wrap">
 
+                <div class="icon32" id="icon-buddypress"><br></div>
+
 		<h2><?php _e( 'BuddyPress Settings', 'buddypress' ) ?></h2>
 
 		<?php if ( isset( $_POST['bp-admin'] ) ) : ?>
@@ -173,6 +175,8 @@
 
 	<div class="wrap">
 
+                <div class="icon32" id="icon-buddypress"><br></div>
+
 		<h2><?php _e( 'BuddyPress Component Setup', 'buddypress' ) ?></h2>
 
 		<?php if ( isset( $_POST['bp-admin-component-submit'] ) ) : ?>
Index: bp-core/bp-core-cssjs.php
===================================================================
--- bp-core/bp-core-cssjs.php	(revision 3015)
+++ bp-core/bp-core-cssjs.php	(working copy)
@@ -23,7 +23,7 @@
 			wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/css/adminbar.css' ) );
 	}
 }
-add_action( 'init', 'bp_core_add_admin_bar_css' );
+add_action( (is_admin()) ? 'admin_print_styles' : 'init' , 	'bp_core_add_admin_bar_css' );
 
 /**
  * bp_core_admin_menu_icon_css()
@@ -33,16 +33,14 @@
  * @package BuddyPress Core
  */
 function bp_core_admin_menu_icon_css() {
-	global $bp;
-?>
-	<style type="text/css">
-		ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { background-image: url( <?php echo BP_PLUGIN_URL . '/bp-core/images/admin_menu_icon.png' ?> ) !important; background-position: -1px -32px; }
-		ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a { background-position: -1px 0; }
-		ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { display: none; }
-	</style>
-<?php
+	$pathcss		= BP_PLUGIN_DIR . '/bp-core/css/colors_' . get_user_option('admin_color') . '.css';
+	$css_url		= BP_PLUGIN_URL . '/bp-core/css/colors_' . get_user_option('admin_color') . '.css';
+	$css_url_default 	= BP_PLUGIN_URL . '/bp-core/css/colors_fresh.css';
+	$css_url		= (is_file($pathcss)) ? $css_url : $css_url_default;
+	wp_register_style ( 'BuddyPress_colors', 	$css_url);
+	wp_enqueue_style  ( 'BuddyPress_colors' );
 }
-add_action( 'admin_head', 'bp_core_admin_menu_icon_css' );
+add_action( 'admin_print_styles', 'bp_core_admin_menu_icon_css' );
 
 function bp_core_confirmation_js() {
 	global $current_blog;
Index: bp-core/css/colors_classic.css
===================================================================
--- bp-core/css/colors_classic.css	(revision 0)
+++ bp-core/css/colors_classic.css	(revision 0)
@@ -0,0 +1,14 @@
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { 
+	background-image: url(../images/bp_admin_menu_icon-vs.png);
+	background-position: -1px -32px; 
+}
+ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a { 
+	background-position: -1px 0; 
+}
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { 
+	display: none; 
+}
+
+#icon-buddypress {
+	background:transparent url(../images/icon32-vs.png) no-repeat;
+}
\ No newline at end of file
Index: bp-core/css/colors_fresh.css
===================================================================
--- bp-core/css/colors_fresh.css	(revision 0)
+++ bp-core/css/colors_fresh.css	(revision 0)
@@ -0,0 +1,14 @@
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { 
+	background-image: url(../images/bp_admin_menu_icon.png);
+	background-position: -1px -32px; 
+}
+ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a { 
+	background-position: -1px 0; 
+}
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { 
+	display: none; 
+}
+
+#icon-buddypress {
+	background:transparent url(../images/icon32.png);
+}
\ No newline at end of file
Index: bp-core/images/bp_admin_menu_icon-vs.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: bp-core\images\bp_admin_menu_icon-vs.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: bp-core/images/bp_admin_menu_icon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: bp-core\images\bp_admin_menu_icon.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: bp-core/images/icon32-vs.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: bp-core\images\icon32-vs.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: bp-core/images/icon32.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: bp-core\images\icon32.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: bp-forums/bp-forums-admin.php
===================================================================
--- bp-forums/bp-forums-admin.php	(revision 3015)
+++ bp-forums/bp-forums-admin.php	(working copy)
@@ -5,6 +5,8 @@
 ?>
 	<div class="wrap">
 
+		<div class="icon32" id="icon-buddypress"><br></div>
+
 		<h2><?php _e( 'Forums Setup', 'buddypress' ) ?></h2>
 
 		<?php if ( isset( $_POST['submit'] ) ) : ?>
Index: bp-themes/bp-default/_inc/options.php
===================================================================
--- bp-themes/bp-default/_inc/options.php	(revision 3015)
+++ bp-themes/bp-default/_inc/options.php	(working copy)
@@ -24,6 +24,9 @@
     	} ?>
 
 		<div class="wrap">
+
+                    <div class="icon32" id="icon-buddypress"><br></div>
+
 		    <?php echo "<h2>" . __( 'Theme Options', 'buddypress' ) . "</h2>"; ?>
 
 			<form name="options" method="post" action="">
Index: bp-xprofile/bp-xprofile-admin.php
===================================================================
--- bp-xprofile/bp-xprofile-admin.php	(revision 3015)
+++ bp-xprofile/bp-xprofile-admin.php	(working copy)
@@ -41,7 +41,7 @@
 ?>
 
 	<div class="wrap">
-		<div class="icon32" id="icon-tools"><br></div>
+		<div class="icon32" id="icon-buddypress"><br></div>
 		<h2>
 			<?php _e( 'Profile Field Setup', 'buddypress'); ?>
 			<a id="add_group" class="button add-new-h2" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ); ?></a>
Index: bp-xprofile/bp-xprofile-classes.php
===================================================================
--- bp-xprofile/bp-xprofile-classes.php	(revision 3015)
+++ bp-xprofile/bp-xprofile-classes.php	(working copy)
@@ -190,7 +190,9 @@
 		}
 ?>
 		<div class="wrap">
-			<div class="icon32" id="icon-tools"><br></div>
+
+			<div class="icon32" id="icon-buddypress"><br></div>
+
 			<h2><?php echo $title; ?></h2>
 			<p><?php _e( 'Fields marked * are required', 'buddypress' ) ?></p>
 
@@ -592,7 +594,9 @@
 		}
 ?>
 	<div class="wrap">
-		<div id="icon-users" class="icon32"><br /></div>
+
+		<div class="icon32" id="icon-buddypress"><br></div>
+
 		<h2><?php echo $title; ?></h2>
 		<p><?php _e( 'Fields marked * are required', 'buddypress' ) ?></p>