diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml
index ccd86b662c6..629119b98d0 100644
--- a/addons/website_profile/views/website_profile.xml
+++ b/addons/website_profile/views/website_profile.xml
@@ -376,12 +376,12 @@
                 </t>
             </t>
         </div>
-        <div class="mb-3" t-if="not user.badge_ids">
-            <p class="text-muted">No badge yet</p>
+        <div class="mb-3 d-inline-block" t-if="not user.badge_ids">
+            <p class="text-muted">No badges yet!</p>
         </div>
-        <div class="text-right">
-            <a t-if="not user.badge_ids and badge_category" t-attf-href="/profile/ranks_badges?badge_category=#{badge_category}"><i class="fa fa-arrow-right"/> Check available badges</a>
-            <a t-else="" href="/profile/ranks_badges" class="btn btn-link btn-sm"><i class="fa fa-arrow-right mr-1"/>Check all available badges</a>
+        <div class="text-right d-inline-block pull-right">
+            <a t-if="not user.badge_ids and badge_category" t-attf-href="/profile/ranks_badges?badge_category=#{badge_category}" class="btn btn-link btn-sm"><i class="fa fa-arrow-right"/> All Badges</a>
+            <a t-else="" href="/profile/ranks_badges" class="btn btn-link btn-sm"><i class="fa fa-arrow-right mr-1"/>All Badges</a>
         </div>
     </template>
 
diff --git a/addons/website_slides/views/website_slides_templates_profile.xml b/addons/website_slides/views/website_slides_templates_profile.xml
index a6f62c1b4b1..415762f82b9 100644
--- a/addons/website_slides/views/website_slides_templates_profile.xml
+++ b/addons/website_slides/views/website_slides_templates_profile.xml
@@ -17,14 +17,17 @@
                     <t t-if="courses_completed" t-call="website_slides.display_course">
                         <t t-set="courses" t-value="courses_completed"></t>
                     </t>
-                    <p t-else="" class="text-muted">No completed course yet</p>
+                    <div t-else="" class="text-muted d-inline-block">No completed courses yet!</div>
+                    <div class="text-right d-inline-block pull-right">
+                        <a href="/slides/all" class="btn btn-link btn-sm"><i class="fa fa-arrow-right mr-1"/>All Courses</a>
+                    </div>
                 </div>
                 <div class="mb32">
                     <h5 class="border-bottom pb-1">Followed Courses</h5>
                     <t t-if="courses_ongoing" t-call="website_slides.display_course">
                         <t t-set="courses" t-value="courses_ongoing"></t>
                     </t>
-                    <p t-else="" class="text-muted">No followed course yet</p>
+                    <p t-else="" class="text-muted">No followed courses yet!</p>
                 </div>
             </t>
         </xpath>
diff --git a/addons/website_slides_survey/views/website_profile.xml b/addons/website_slides_survey/views/website_profile.xml
index 577c274132b..386afb35c94 100644
--- a/addons/website_slides_survey/views/website_profile.xml
+++ b/addons/website_slides_survey/views/website_profile.xml
@@ -42,8 +42,11 @@
             </div>
         </t>
         <t t-else="">
-            <p class="text-muted">No certifications yet!</p>
+            <div class="text-muted d-inline-block">No certifications yet!</div>
         </t>
+        <div class="text-right d-inline-block pull-right">
+            <a href="/slides/all?slide_type=certification" class="btn btn-link btn-sm"><i class="fa fa-arrow-right mr-1"/>All Certifications</a>
+        </div>
     </template>
 
     <template id="top3_user_card" inherit_id="website_profile.top3_user_card">