diff --git bp-core/admin/css/common.css bp-core/admin/css/common.css
index dbf312f..61755b2 100644
--- bp-core/admin/css/common.css
+++ bp-core/admin/css/common.css
@@ -7,15 +7,18 @@
 /* Icon 32's
 ------------------------------------------------------------------------------*/
 
-div#icon-buddypress {
+body.branch-3-6 div#icon-buddypress,
+body.branch-3-7 div#icon-buddypress {
 	background: url('../images/icons32.png') no-repeat -370px -6px;
 }
 
-div#icon-buddypress-activity {
+body.branch-3-6 div#icon-buddypress-activity,
+body.branch-3-7 div#icon-buddypress-activity {
 	background: url('../images/icons32.png') no-repeat -10px -6px;
 }
 
-div#icon-buddypress-groups {
+body.branch-3-6 div#icon-buddypress-groups,
+body.branch-3-7 div#icon-buddypress-groups {
 	background: url('../images/icons32.png') no-repeat -250px -6px;
 }
 
@@ -23,46 +26,68 @@ div#icon-buddypress-groups {
 ------------------------------------------------------------------------------*/
 
 /* Backpat */
-ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image {
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image {
 	background-image: url('../images/menu.png') !important;
 	background-position: -178px -34px;
 }
 
-ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image {
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image {
 	background-position: -178px -2px;
 }
 
 /* Activity */
-ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image {
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image {
 	background-image: url('../images/menu.png');
 	background-position: 0 -34px;
 }
-ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-activity_network:hover .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-activity_network.current .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-activity_network.wp-has-current-submenu .wp-menu-image {
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network:hover .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network.current .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network.wp-has-current-submenu .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network:hover .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network.current .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network.wp-has-current-submenu .wp-menu-image {
 	background-position: 0 -2px;
 }
 
 /* Groups */
-ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image {
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image {
 	background-image: url('../images/menu.png');
 	background-position: -61px -34px;
 }
-ul#adminmenu li.toplevel_page_bp-groups:hover .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-groups.current .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-groups.wp-has-current-submenu .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-groups_network:hover .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-groups_network.current .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-groups_network.wp-has-current-submenu .wp-menu-image {
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups:hover .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups.current .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups.wp-has-current-submenu .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network:hover .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network.current .wp-menu-image,
+body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network.wp-has-current-submenu .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups:hover .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups.current .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups.wp-has-current-submenu .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network:hover .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network.current .wp-menu-image,
+body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network.wp-has-current-submenu .wp-menu-image {
 	background-position: -61px -2px;
 }
 th.column-gid {
@@ -90,73 +115,222 @@ table.bp-group-members .urole-column {
 /* Components
 ------------------------------------------------------------------------------*/
 
-.dashboard_page_bp-wizard td.plugin-title span,
+/* Dashicons */
+#adminmenu #toplevel_page_bp-activity .wp-menu-image:before,
+#adminmenu #toplevel_page_bp-activity_network .wp-menu-image:before {
+	content: "\f452";
+}
+
+#adminmenu #toplevel_page_bp-groups .wp-menu-image:before,
+#adminmenu #toplevel_page_bp-groups_network .wp-menu-image:before {
+	content: "\f456";
+}
+
+#adminmenu li.toplevel_page_bp-components .wp-menu-image,
+#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image {
+	content: "\f448";
+}
+
+/* Dashicons overrides for backward compatibility */
+body.branch-3-6 #adminmenu #toplevel_page_bp-activity .wp-menu-image:before,
+body.branch-3-6 #adminmenu #toplevel_page_bp-activity_network .wp-menu-image:before,
+body.branch-3-6 #adminmenu #toplevel_page_bp-groups .wp-menu-image:before,
+body.branch-3-6 #adminmenu #toplevel_page_bp-groups_network .wp-menu-image:before,
+body.branch-3-6 #adminmenu li.toplevel_page_bp-components .wp-menu-image,
+body.branch-3-6 #adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,
+body.branch-3-7 #adminmenu #toplevel_page_bp-activity .wp-menu-image:before,
+body.branch-3-7 #adminmenu #toplevel_page_bp-activity_network .wp-menu-image:before,
+body.branch-3-7 #adminmenu #toplevel_page_bp-groups .wp-menu-image:before,
+body.branch-3-7 #adminmenu #toplevel_page_bp-groups_network .wp-menu-image:before,
+body.branch-3-7 #adminmenu li.toplevel_page_bp-components .wp-menu-image,
+body.branch-3-7 #adminmenu li.toplevel_page_bp-general-settings .wp-menu-image {
+	content: "";
+}
+
+/* Settings - Dashicons (WP 3.8+) */
 .settings_page_bp-components td.plugin-title span {
 	float: left;
 	width: 18px;
 	height: 18px;
+	margin-right: 5px;
+}
+
+.settings_page_bp-components td.plugin-title span:before {
+	font-family: 'dashicons';
+	font-size: 18px;
+}
+
+.settings_page_bp-components tr.activity td.plugin-title span:before {
+	content: "\f452";
+}
+
+.settings_page_bp-components tr.notifications td.plugin-title span:before {
+	content: "\f339";
+}
+
+.settings_page_bp-components tr.xprofile td.plugin-title span:before {
+	content: "\f336";
+}
+
+.settings_page_bp-components tr.settings td.plugin-title span:before {
+	content: "\f108";
+}
+
+.settings_page_bp-components tr.groups td.plugin-title span:before {
+	content: "\f456";
+}
+
+.settings_page_bp-components tr.messages td.plugin-title span:before {
+	content: "\f457";
+}
+
+.settings_page_bp-components tr.forums td.plugin-title span:before {
+	content: "\f452";
+}
+
+.settings_page_bp-components tr.blogs td.plugin-title span:before {
+	content: "\f120";
+}
+
+.settings_page_bp-components tr.friends td.plugin-title span:before {
+	content: "\f454";
+}
+
+/* Settings - Legacy (< WP 3.8) */
+body.branch-3-6.settings_page_bp-components tr.activity td.plugin-title span:before,
+body.branch-3-6.settings_page_bp-components tr.notifications td.plugin-title span:before,
+body.branch-3-6.settings_page_bp-components tr.xprofile td.plugin-title span:before,
+body.branch-3-6.settings_page_bp-components tr.settings td.plugin-title span:before,
+body.branch-3-6.settings_page_bp-components tr.groups td.plugin-title span:before,
+body.branch-3-6.settings_page_bp-components tr.messages td.plugin-title span:before,
+body.branch-3-6.settings_page_bp-components tr.forums td.plugin-title span:before,
+body.branch-3-6.settings_page_bp-components tr.blogs td.plugin-title span:before,
+body.branch-3-6.settings_page_bp-components tr.friends td.plugin-title span:before,
+body.branch-3-7.settings_page_bp-components tr.activity td.plugin-title span:before,
+body.branch-3-7.settings_page_bp-components tr.notifications td.plugin-title span:before,
+body.branch-3-7.settings_page_bp-components tr.xprofile td.plugin-title span:before,
+body.branch-3-7.settings_page_bp-components tr.settings td.plugin-title span:before,
+body.branch-3-7.settings_page_bp-components tr.groups td.plugin-title span:before,
+body.branch-3-7.settings_page_bp-components tr.messages td.plugin-title span:before,
+body.branch-3-7.settings_page_bp-components tr.forums td.plugin-title span:before,
+body.branch-3-7.settings_page_bp-components tr.blogs td.plugin-title span:before,
+body.branch-3-7.settings_page_bp-components tr.friends td.plugin-title span:before {
+	content: "";
+}
+
+body.branch-3-6.settings_page_bp-components td.plugin-title span,
+body.branch-3-7.settings_page_bp-components td.plugin-title span {
 	background-image: url('../images/menu.png');
 	background-position: -4px -40px;
 	background-repeat: no-repeat;
-	margin-right: 5px;
 }
 
-.dashboard_page_bp-wizard tr.active td.plugin-title span,
-.settings_page_bp-components tr.active td.plugin-title span {
+body.branch-3-6.settings_page_bp-components tr.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.active td.plugin-title span {
 	background-position-y: -7px;
 }
 
-.dashboard_page_bp-wizard tr.activity td.plugin-title span,
-.settings_page_bp-components tr.activity td.plugin-title span {
-	background-position-x: -4px;
+body.branch-3-6.settings_page_bp-components tr.activity td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.activity td.plugin-title span {
+	background-position: -4px -40px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.activity.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.activity.active td.plugin-title span {
+	background-position: -4px -7px;
 }
 
-.dashboard_page_bp-wizard tr.xprofile td.plugin-title span,
-.settings_page_bp-components tr.xprofile td.plugin-title span {
+body.branch-3-6.settings_page_bp-components tr.xprofile td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.xprofile td.plugin-title span {
 	background-image: url('../images/menu-wp.png');
-	background-position-x: -305px;
+	background-position: -305px -40px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.xprofile.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.xprofile.active td.plugin-title span {
+	background-position: -305px -7px;
 }
 
-.dashboard_page_bp-wizard tr.settings td.plugin-title span,
-.settings_page_bp-components tr.settings td.plugin-title span {
+body.branch-3-6.settings_page_bp-components tr.settings td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.settings td.plugin-title span {
 	background-image: url('../images/menu-wp.png');
-	background-position-x: -334px;
+	background-position: -334px -40px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.settings.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.settings.active td.plugin-title span {
+	background-position: -334px -7px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.groups td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.groups td.plugin-title span {
+	background-position: -66px -40px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.groups.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.groups.active td.plugin-title span {
+	background-position: -66px -7px;
 }
 
-.dashboard_page_bp-wizard tr.groups td.plugin-title span,
-.settings_page_bp-components tr.groups td.plugin-title span {
-	background-position-x: -66px;
+body.branch-3-6.settings_page_bp-components tr.messages td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.messages td.plugin-title span {
+	background-position: -154px -40px;
 }
 
-.dashboard_page_bp-wizard tr.messages td.plugin-title span,
-.settings_page_bp-components tr.messages td.plugin-title span {
-	background-position-x: -154px;
+body.branch-3-6.settings_page_bp-components tr.messages.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.messages.active td.plugin-title span {
+	background-position: -154px -7px;
 }
 
-.dashboard_page_bp-wizard tr.forums td.plugin-title span,
-.settings_page_bp-components tr.forums td.plugin-title span {
+body.branch-3-6.settings_page_bp-components tr.forums td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.forums td.plugin-title span {
 	background-image: url('../images/menu-wp.png');
-	background-position-x: -36px;
+	background-position: -36px -40px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.forums.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.forums.active td.plugin-title span {
+	background-position: -36px -7px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.blogs td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.blogs td.plugin-title span {
+	background-position: -125px -40px;
 }
 
-.dashboard_page_bp-wizard tr.blogs td.plugin-title span,
-.settings_page_bp-components tr.blogs td.plugin-title span {
-	background-position-x: -125px;
+body.branch-3-6.settings_page_bp-components tr.blogs.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.blogs.active td.plugin-title span {
+	background-position: -125px -7px;
 }
 
-.dashboard_page_bp-wizard tr.friends td.plugin-title span,
-.settings_page_bp-components tr.friends td.plugin-title span {
-	background-position-x: -95px;
+body.branch-3-6.settings_page_bp-components tr.friends td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.friends td.plugin-title span {
+	background-position: -95px -40px;
 }
 
-.dashboard_page_bp-wizard tr.core td.plugin-title span,
-.settings_page_bp-components tr.core td.plugin-title span {
-	background-position-x: -184px;
+body.branch-3-6.settings_page_bp-components tr.friends.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.friends.active td.plugin-title span {
+	background-position: -95px -7px;
 }
 
-.dashboard_page_bp-wizard tr.members td.plugin-title span,
-.settings_page_bp-components tr.members td.plugin-title span {
-	background-position-x: -36px;
+body.branch-3-6.settings_page_bp-components tr.core td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.core td.plugin-title span {
+	background-position: -184px -40px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.core.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.core.active td.plugin-title span {
+	background-position: -184px -7px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.members td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.members td.plugin-title span {
+	background-position: -36px -40px;
+}
+
+body.branch-3-6.settings_page_bp-components tr.members.active td.plugin-title span,
+body.branch-3-7.settings_page_bp-components tr.members.active td.plugin-title span {
+	background-position: -36px -7px;
 }
 
 #bp-admin-component-form .widefat th {
@@ -194,20 +368,29 @@ table.bp-group-members .urole-column {
 @media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
 
 	/* Icon 32 */
-	div#icon-buddypress,
-	div#icon-buddypress-activity,
-	div#icon-buddypress-groups {
+	body.branch-3-6 div#icon-buddypress,
+	body.branch-3-6 div#icon-buddypress-activity,
+	body.branch-3-6 div#icon-buddypress-groups,
+	body.branch-3-7 div#icon-buddypress,
+	body.branch-3-7 div#icon-buddypress-activity,
+	body.branch-3-7 div#icon-buddypress-groups {
 		background-image: url('../images/icons64.png');
 		background-size: 419px 45px;
 	}
 
 	/* Backpat */
-	ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,
-	ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,
-	ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,
-	ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,
-	ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,
-	ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image {
+	body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,
+	body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,
+	body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,
+	body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,
+	body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,
+	body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image,
+	body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,
+	body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,
+	body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,
+	body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,
+	body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,
+	body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image {
 		background-image: url('../images/menu-2x.png') !important;
 		background-size: 209px 64px;
 	}
@@ -217,4 +400,4 @@ table.bp-group-members .urole-column {
 		background-image: url('../images/badge-2x.png');
 		background-size: 173px 194px;
 	}
-}
\ No newline at end of file
+}