diff --git a/templates/widgets/course-teaser/course-teaser.hamlet b/templates/widgets/course-teaser/course-teaser.hamlet
index 76f8cdb9f..2640a8ca4 100644
--- a/templates/widgets/course-teaser/course-teaser.hamlet
+++ b/templates/widgets/course-teaser/course-teaser.hamlet
@@ -3,14 +3,11 @@
   <div .course-shorthand>_{courseShorthand}
   <div .course-title>
     <a href=@{AdminTestR}>_{courseTitle}
+  <div .course-registration>_{MsgRegistered}
   <div .course-lecturer-label>_{MsgLecturerFor}
   <div .course-lecturer-value>_{courseLecturer}
   <div .course-duedate-label>_{MsgRegisterTo}
   <div .course-duedate-value>_{courseRegisterTo}
   <div .course-school-label>_{MsgCourseSchool}
   <div .course-school-value>_{courseSchoolName}
-  <div .course-registration>
-    <a .course-registration__register course-registration__item button href=@{AdminTestR}>_{MsgBtnRegister}
-    <a .course-registration__deregister course-registration__item href=@{AdminTestR}>_{MsgBtnDeregister}
-    <span .course-registration__registered course-registration__item>_{MsgRegistered}
   <div .course-description>_{courseDescription}
diff --git a/templates/widgets/course-teaser/course-teaser.lucius b/templates/widgets/course-teaser/course-teaser.lucius
index 5ae58c8e3..c7e280f25 100644
--- a/templates/widgets/course-teaser/course-teaser.lucius
+++ b/templates/widgets/course-teaser/course-teaser.lucius
@@ -1,4 +1,5 @@
 :root {
+  --color-fontsec: #5b5861;
   --course-bg-color: var(--color-grey-lighter);
   --course-expanded-bg-color: var(--color-grey-light);
 }
@@ -27,13 +28,14 @@
   cursor: pointer;
   padding: 10px;
   grid-column: 4;
-  grid-row: 1/3;
+  grid-row: 1;
   justify-self: center;
   align-self: center;
 
   &::before {
     content: '';
     display: block;
+    margin-top: -8px;
     border-width: 0 3px 3px 0;
     width: 8px;
     height: 8px;
@@ -65,24 +67,21 @@
 // title
 .course-title {
   grid-column: 3;
+  grid-row: 1;
   font-size: 1.6rem;
-  align-self: flex-end;
+  align-self: baseline;
 }
 
 // registration
 .course-registration {
-  grid-column: 4;
-  grid-row: 3/5;
-  justify-self: center;
-  align-self: flex-end;
+  grid-column: 3;
+  grid-row: 1;
+  justify-self: end;
+  align-self: baseline;
   font-size: 16px;
   color: var(--color-fontsec);
 }
 
-.course-registration__item {
-  display: none;
-}
-
 // school
 .course-school-label {
   grid-column: 3;
@@ -120,26 +119,10 @@
 // registered courses
 .course--registered {
 
-  .course-registration__registered {
-    display: block;
-  }
-
-  .course-registration__deregister {
-    display: none;
-  }
-
-  &:hover {
-
-    .course-registration__register,
-    .course-registration__registered {
-      display: none;
-    }
-
-    .course-registration__deregister {
+  .course-registration {
       display: block;
     }
   }
-}
 
 // expanded courses
 .course--expanded {
@@ -153,15 +136,7 @@
   .course-school-value,
   .course-duedate-label,
   .course-duedate-value,
-  .course-registration,
-  .course-registration__register,
   .course-description {
     display: block;
   }
-
-  &.course--registered {
-    .course-registration__register {
-      display: none;
-    }
-  }
 }