diff --git a/src/main/java/org/olat/core/commons/modules/bc/meta/_chelp/bc-metainfo.html b/src/main/java/org/olat/core/commons/modules/bc/meta/_chelp/bc-metainfo.html
index 8f8e67ab81d7c5ba06da16222060427392ef77a2..b39d3f67b9a9e08e22a471b0c264674899ad39fe 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/meta/_chelp/bc-metainfo.html
+++ b/src/main/java/org/olat/core/commons/modules/bc/meta/_chelp/bc-metainfo.html
@@ -1,5 +1,5 @@
 <p>
-	$r.translate("chelp.meta.intro", "<a href='http://en.wikipedia.org/wiki/Dublin_Core' class='b_link_extern' target='_blank'>Dublin Simple Core</a>")
+	$r.translate("chelp.meta.intro", "<a href='http://en.wikipedia.org/wiki/Dublin_Core' class='o_link_extern' target='_blank'><i class='o_icon o_icon_link_extern'> </i> Dublin Simple Core</a>")
 </p>
 <p>
 	$r.translate("chelp.meta.purpose")
diff --git a/src/main/java/org/olat/core/util/mail/_content/attachments.html b/src/main/java/org/olat/core/util/mail/_content/attachments.html
index 9d18a59089f7c40e2730b17185c9294062fb3d12..a848bc903ec860de4b5a65f12cb0e88f8f17ed25 100644
--- a/src/main/java/org/olat/core/util/mail/_content/attachments.html
+++ b/src/main/java/org/olat/core/util/mail/_content/attachments.html
@@ -1,5 +1,5 @@
-<ul class="b_mail_attachments"">
+<p class="from-static-control"><ul class="list-unstyled"">
 	#foreach ($attachment in $attachments)
-		<li><a href="$mapperBaseURI/attachments/$attachment.key/$attachment.name" class="b_with_small_icon_left $attachment.cssClass" target="_blank"><span>$attachment.name</span></a></li>
+		<li><a href="$mapperBaseURI/attachments/$attachment.key/$attachment.name" target="_blank"><i class="o_icon o_icon-fw $attachment.cssClass"> </i> $attachment.name</a></li>
 	#end
-</ul>
+</ul></p>
diff --git a/src/main/java/org/olat/group/ui/_content/bg_admin.html b/src/main/java/org/olat/group/ui/_content/bg_admin.html
index 641324adc3724d45082187fad5f789834bccfb8c..a8feba1615a561b4bd2b5d7954c3816a37aa8412 100644
--- a/src/main/java/org/olat/group/ui/_content/bg_admin.html
+++ b/src/main/java/org/olat/group/ui/_content/bg_admin.html
@@ -1,22 +1,22 @@
-<div class="b_form clearfix">
+<div class="o_form clearfix">
 	<fieldset>
 		<legend>$r.translate("module.admin.title")</legend>
-		<div class="b_form_desc">$r.translate("module.admin.desc")</div>
+		<div class="o_desc">$r.translate("module.admin.desc")</div>
 		$r.render("options")
 	</fieldset>
 	<fieldset>
 		<legend>$r.translate("module.resource.title")</legend>
-		<div class="b_form_desc">$r.translate("module.resource.desc")</div>
+		<div class="o_desc">$r.translate("module.resource.desc")</div>
 		$r.render("resourceAssignment")
 	</fieldset>
 	<fieldset>
 		<legend>$r.translate("module.privacy.title")</legend>
-		<div class="b_form_desc">$r.translate("module.privacy.desc")</div>
+		<div class="o_desc">$r.translate("module.privacy.desc")</div>
 		$r.render("privacy_options")
 	</fieldset>
 	<fieldset>
 		<legend>$r.translate("dedup.members")</legend>
-		<div class="b_form_desc">$r.translate("dedup.members.desc")</div>
+		<div class="o_desc">$r.translate("dedup.members.desc")</div>
 		$r.render("dedup")
 	</fieldset>
 </div>
\ No newline at end of file
diff --git a/src/main/java/org/olat/group/ui/wizard/BGUserStatusCellRenderer.java b/src/main/java/org/olat/group/ui/wizard/BGUserStatusCellRenderer.java
index f4383bfd7c76dd03c11d9be7fc4b420c57c765af..c2955cb87b42450da4155efd90971703ffab0bdf 100644
--- a/src/main/java/org/olat/group/ui/wizard/BGUserStatusCellRenderer.java
+++ b/src/main/java/org/olat/group/ui/wizard/BGUserStatusCellRenderer.java
@@ -32,16 +32,12 @@ import org.olat.core.gui.render.StringOutput;
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  */
 public class BGUserStatusCellRenderer implements CustomCellRenderer {
-	
-	public BGUserStatusCellRenderer() {
-		//
-	}
 
 	@Override
 	public void render(StringOutput sb, Renderer renderer, Object val, Locale locale, int alignment, String action) {
 		if(val instanceof BGUserManagementGroupTableDataModel.Status) {
 			BGUserManagementGroupTableDataModel.Status status = (BGUserManagementGroupTableDataModel.Status)val;
-			sb.append("<div class='b_status'><span>");
+			sb.append("<div class='o_status'><span>");
 			switch(status) {
 				case newOwner: {
 					sb.append("+O"); break;