diff --git a/src/main/java/org/olat/core/gui/control/generic/modal/DialogBoxController.java b/src/main/java/org/olat/core/gui/control/generic/modal/DialogBoxController.java
index 69f580d0ae405cb8a32c9fe2af14c2cb238ed35e..f0a1a268a109bc66ced30d544a2779cc32765328 100644
--- a/src/main/java/org/olat/core/gui/control/generic/modal/DialogBoxController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/modal/DialogBoxController.java
@@ -169,7 +169,7 @@ public class DialogBoxController extends BasicController {
 	}
 
 	public void activate() {
-		getWindowControl().pushAsModalDialog(this.getInitialComponent());
+		getWindowControl().pushAsModalDialog(getInitialComponent());
 	}
 	
 	/**
diff --git a/src/main/java/org/olat/core/gui/control/generic/modal/_content/dialogbox.html b/src/main/java/org/olat/core/gui/control/generic/modal/_content/dialogbox.html
index d9d093e04db829b3a5b78b20da479b7512378795..116657c1ff2aa25818f775ab060a3f7e43a509f0 100644
--- a/src/main/java/org/olat/core/gui/control/generic/modal/_content/dialogbox.html
+++ b/src/main/java/org/olat/core/gui/control/generic/modal/_content/dialogbox.html
@@ -1,38 +1,20 @@
-<div class="b_window b_dialogbox $cssClass" id="$r.getId("b_closablewapper_")">
-	<div class="b_window_header_wrapper">
-		<div class="b_window_header">
-			<div class="b_window_header_title">
-				#if ($title)
-					<strong>$!title</strong>
-				#end
-				#if($closeIcon)
-					$r.render("closeIcon")
-				#end
-			</div>
-		</div>
+<div class="modal show $cssClass" id='$r.getId("b_closablewapper_")'><div class="modal-dialog modal-lg"><div class="modal-content">
+	<div class="modal-header">
+		#if($closeIcon)
+			$r.render("closeIcon")
+		#end
+		#if ($title)
+			<h4>$!title</h4>
+		#end
 	</div>
-
-	<div class="b_window_content_wrapper">	
-		<div class="b_window_content">
-			<div class="b_window_content_inner b_clearfix">
-				#if ($off_chelp_package) $r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") #end
-				<div class="b_msg_dialog"><div class="b_floatscrollbox">
-					$text
-				</div></div>
-				<div class="b_button_group">
-				#foreach ($button in $buttons)
-					$r.render("$button")
-				#end
-				</div>		
-			</div>
-			<div style="clear:both; height: 1px">&nbsp;</div>	   	
-		</div>
-	</div>	
-	
-	<div class="b_window_footer_wrapper">
-		<div class="b_window_footer">
-			<div class="b_window_footer_inner"></div>		
-		</div>
+	<div class="modal-body">
+		#if ($off_chelp_package) $r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") #end
+		<p>$text</p>
+	</div>
+	<div class="modal-footer">
+		#foreach ($button in $buttons)
+			$r.render("$button")
+		#end
 	</div>
 </div>