diff --git a/templates/course.html b/templates/course.html
index b7333e6ab7c742668e567733dd244022111908b8..0d1890d9d9d5c5977049b980995ce17443f7a6a0 100644
--- a/templates/course.html
+++ b/templates/course.html
@@ -8,7 +8,7 @@
 {% extends "base.html" %}
 {% block title %}- {{course.title}}{% endblock %}
 {% block content %}
-<div class="card">
+<div class="card m-1">
 	<div class="card-header">
 		<span class="card-title">
 			{{ moderator_editor(['courses',course.id,'title'], course.title)}}
@@ -65,36 +65,38 @@
 </div>
 	
 {% if ismod() %}
-<div class="card">
+<div class="card m-1">
 	<div class="card-header">
 		<a data-toggle="collapse" href="#statscard" class="plotlyresize"><h1 class="card-title">Statistiken</h1></a>
 	</div>
-	<div class="row card-body collapse out card-collapse" id="statscard">
-		<div class="col-md-6 col-xs-12">
-			<p class="text-center">Zuschauer pro Tag</p>
-			<div class="plot-view" data-url="{{url_for('stats_viewsperday', req="course", param=course.id)}}"></div>
-		</div>
-		<div class="col-md-6 col-xs-12">
-			<p class="text-center">Zuschauer pro Termin</p>
-			<div class="plot-view" data-type="bar" data-url="{{url_for('stats_generic', req="lecture_views", param=course.id)}}"></div>
+	<div class="card-body collapse out card-collapse" id="statscard">
+		<div class="row">
+			<div class="col-6 col-xs-12">
+				<p class="text-center">Zuschauer pro Tag</p>
+				<div class="plot-view" data-url="{{url_for('stats_viewsperday', req="course", param=course.id)}}"></div>
+			</div>
+			<div class="col-6 col-xs-12">
+				<p class="text-center">Zuschauer pro Termin</p>
+				<div class="plot-view" data-type="bar" data-url="{{url_for('stats_generic', req="lecture_views", param=course.id)}}"></div>
+			</div>
 		</div>
 	</div>
 </div>
 {% endif %}
 
-<div class="card">
+<div class="card m-1">
 	<div class="card-header">
 		<h1 class="card-title">Videos
 			{% if ismod() %}
-				<a class="btn btn-light" style="margin-right: 5px;" href="{{ url_for('create', table='lectures', time=datetime.now(), title='Noch kein Titel', visible='0', course_id=course.id, ref=url_for('course', id=course.id)) }}">Neuer Termin</a>
-				<a class="btn btn-light" style="margin-right: 5px;" href="{{url_for('list_import_sources', id=course['id'])}}">Campus Import</a>
+				<a class="btn btn-secondary" style="margin-right: 5px;" href="{{ url_for('create', table='lectures', time=datetime.now(), title='Noch kein Titel', visible='0', course_id=course.id, ref=url_for('course', id=course.id)) }}">Neuer Termin</a>
+				<a class="btn btn-secondary" style="margin-right: 5px;" href="{{url_for('list_import_sources', id=course['id'])}}">Campus Import</a>
 			{% endif %}
-			<ul class="list-inline pull-right">
-				<li>
+			<ul class="list-inline float-right">
+				<li class="list-inline-item">
 					<a class="fa fa-rss-square" aria-hidden="true" href="{{url_for('rss_feed', handle=course.handle)}}" style="text-decoration: none"></a>
 				</li>
 			{% if ismod() %}
-				<li>
+				<li class="list-inline float-right">
 					<a class="fa fa-calendar" aria-hidden="true" href="{{url_for('ical_course', course=course.handle)}}" style="text-decoration: none"></a>
 				</li>
 			{% endif %}
diff --git a/templates/courses.html b/templates/courses.html
index fac1da2bfdc57aced1f4e95453e4af5747db382a..211f3b0df111e83dc03bb2e14cee64405166b2e5 100644
--- a/templates/courses.html
+++ b/templates/courses.html
@@ -4,15 +4,15 @@
 <div class="col-12">
 	<ul class="list-inline float-right">
 		<li class="list-inline-item">
-			 <a class="fa fa-rss-square btn btn-light" aria-hidden="true" href="{{url_for('courses_feed')}}" style="text-decoration: none"></a>
+			 <a class="fa fa-rss-square btn btn-secondary" aria-hidden="true" href="{{url_for('courses_feed')}}" style="text-decoration: none"></a>
 		</li>
 		{% if ismod() %} 
 		<li class="list-inline-item">
-			<a class="fa fa-calendar btn btn-light" aria-hidden="true" href="{{url_for('ical_all')}}" style="text-decoration: none"></a>
+			<a class="fa fa-calendar btn btn-secondary" aria-hidden="true" href="{{url_for('ical_all')}}" style="text-decoration: none"></a>
 		</li>
 		<li class="list-inline-item">
 			{% set newhandle = 'new'+(randint(0,1000)|string) %}
-			<a class="btn btn-light" href="{{ url_for('create', table='courses', handle=newhandle, title='Neue Veranstaltung', ref=url_for('course', handle=newhandle)) }}">Neue Veranstaltung</a>
+			<a class="btn btn-secondary" href="{{ url_for('create', table='courses', handle=newhandle, title='Neue Veranstaltung', ref=url_for('course', handle=newhandle)) }}">Neue Veranstaltung</a>
 		</li>
 		{% endif %}
 		<li class="dropdown float-right list-inline-item" style="padding-right: 0px">
diff --git a/templates/macros.html b/templates/macros.html
index e0645cc8a0748b5ee1090d45e6cb4111941287ab..f0519c84c6fe514aac9cf14955162d3c894e80bd 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -251,13 +251,13 @@ $('#embedcodebtn').popover(
 			<ul class="col-sm-4 col-xs-12 list-unstyled">
 				<li>
 					<ul class="list-inline">
-						<li class="dropdown">
+						<li class="dropdown list-inline-item">
 							{{ video_download_btn(videos) }}
 						</li>
-						<li class="float-right">
+						<li class="float-right list-inline-item">
 							{{ moderator_permissioneditor('lecture', lecture.id, lecture.perm, global_permissions) }}
 						</li>
-						<li class="float-right">
+						<li class="float-right list-inline-item">
 							{{ moderator_delete(['lectures',lecture.id,'deleted']) }}
 						</li>
 					</ul>