diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index b4f54c09b9..35623d5595 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -6636,10 +6636,16 @@ div#chat-remote-video video {
     font-size: 14px;
 }
 
-.grid-courses .items .toolbar > div {
+.grid-courses .items .toolbar {
+    margin-top: 10px;
     text-align: center;
 }
 
+#homepage-announcements .toolbar .btn {
+    padding-left: 7px;
+    padding-right: 7px;
+}
+
 .grid-courses .items .toolbar .info {
     float: left;
     font-size: 12px;
diff --git a/main/inc/lib/CoursesAndSessionsCatalog.class.php b/main/inc/lib/CoursesAndSessionsCatalog.class.php
index 49d64ad381..b564181d28 100644
--- a/main/inc/lib/CoursesAndSessionsCatalog.class.php
+++ b/main/inc/lib/CoursesAndSessionsCatalog.class.php
@@ -1135,7 +1135,7 @@ class CoursesAndSessionsCatalog
         }
 
         return Display::url(
-            Display::returnFontAwesomeIcon('check').' '.$title,
+            Display::returnFontAwesomeIcon('check').PHP_EOL.$title,
             api_get_path(WEB_CODE_PATH).'auth/courses.php'
                 .'?action='.$action.'&sec_token='.$stok
                 .'&course_code='.$course['code'].'&search_term='.$search_term.'&category_code='.$categoryCode,
@@ -1166,9 +1166,9 @@ class CoursesAndSessionsCatalog
             '&search_term='.$search_term.'&category_code='.$categoryCode;
 
         return Display::url(
-            Display::returnFontAwesomeIcon('sign-in').' '.$title,
+            Display::returnFontAwesomeIcon('sign-in').PHP_EOL.$title,
             $url,
-            ['class' => 'btn btn-danger', 'title' => $title, 'aria-label' => $title]
+            ['class' => 'btn btn-danger btn-sm', 'title' => $title, 'aria-label' => $title]
         );
     }
 
@@ -2169,10 +2169,10 @@ class CoursesAndSessionsCatalog
                 // if user registered as student
                 if ($userRegisteredInCourse) {
                     $course['already_registered_formatted'] = Display::url(
-                        Display::returnFontAwesomeIcon('external-link').' '.
+                        Display::returnFontAwesomeIcon('external-link').PHP_EOL.
                         get_lang('GoToCourse'),
                         $courseUrl.$course['directory'].'/index.php?id_session=0',
-                        ['class' => 'btn btn-primary']
+                        ['class' => 'btn btn-primary btn-sm']
                     );
 
                     if (!$courseClosed && $course_unsubscribe_allowed
diff --git a/main/template/default/catalog/course_item_catalog.tpl b/main/template/default/catalog/course_item_catalog.tpl
index 084d5b07f2..9fae2c93a5 100644
--- a/main/template/default/catalog/course_item_catalog.tpl
+++ b/main/template/default/catalog/course_item_catalog.tpl
@@ -104,18 +104,12 @@
             {% endblock %}
 
             {% block course_toolbar %}
-                <div class="toolbar row">
+                <div class="toolbar">
                     {% if course.already_registered_formatted %}
-                        <div class="col-sm-6">
-                            {{ course.unregister_formatted }}
-                        </div>
-                        <div class="col-sm-6">
-                            {{ course.already_registered_formatted }}
-                        </div>
+                        {{ course.unregister_formatted }}
+                        {{ course.already_registered_formatted }}
                     {% else %}
-                        <div class="col-sm-12">
-                            {{ course.subscribe_formatted }}
-                        </div>
+                        {{ course.subscribe_formatted }}
                     {% endif %}
                 </div>
             {% endblock %}