diff --git a/src/assets/icons/loki.svg b/src/assets/icons/loki.svg
index 1e61fd61a..c9f38de02 100644
--- a/src/assets/icons/loki.svg
+++ b/src/assets/icons/loki.svg
@@ -1,4 +1,4 @@
-<svg width="94" height="30" viewBox="0 0 94 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 94 30" fill="none" xmlns="http://www.w3.org/2000/svg">
     <g clip-path="url(#clip0_282_1626)">
         <path
             d="M38.4159 18.888V10.7585H39.9886V18.888H38.4159ZM39.5723 18.888V17.4888H43.7122V18.888H39.5723ZM47.2156 19.0037C46.6297 19.0037 46.1093 18.8803 45.6544 18.6336C45.1996 18.3792 44.8372 18.0323 44.5674 17.5928C44.3053 17.1534 44.1742 16.6523 44.1742 16.0895C44.1742 15.5344 44.3014 15.041 44.5558 14.6093C44.818 14.1699 45.1726 13.823 45.6197 13.5685C46.0669 13.3064 46.5641 13.1754 47.1115 13.1754C47.6512 13.1754 48.1253 13.2987 48.5339 13.5454C48.9502 13.7844 49.274 14.1159 49.5053 14.5399C49.7443 14.9562 49.8638 15.4304 49.8638 15.9623C49.8638 16.0625 49.8561 16.1666 49.8406 16.2745C49.8329 16.3748 49.8137 16.4904 49.7828 16.6215L45.0878 16.633V15.4997L49.0774 15.4882L48.4645 15.9623C48.4491 15.6308 48.3874 15.3533 48.2795 15.1297C48.1793 14.9061 48.0289 14.7365 47.8285 14.6209C47.6357 14.4975 47.3968 14.4358 47.1115 14.4358C46.8108 14.4358 46.5487 14.5052 46.3252 14.644C46.1016 14.7751 45.9281 14.9639 45.8048 15.2106C45.6891 15.4496 45.6313 15.7349 45.6313 16.0664C45.6313 16.4056 45.693 16.7024 45.8163 16.9568C45.9474 17.2035 46.1324 17.3963 46.3714 17.535C46.6104 17.6661 46.8879 17.7316 47.204 17.7316C47.4893 17.7316 47.7475 17.6854 47.9788 17.5928C48.2101 17.4926 48.4105 17.3461 48.5802 17.1534L49.4706 18.0438C49.2008 18.3599 48.8693 18.5989 48.4761 18.7608C48.0906 18.9227 47.6704 19.0037 47.2156 19.0037ZM50.8006 18.888V13.3026H52.3155V18.888H50.8006ZM52.3155 15.8004L51.7258 15.4072C51.7952 14.7211 51.9956 14.1814 52.3271 13.7883C52.6586 13.3874 53.1366 13.1869 53.7611 13.1869C54.0309 13.1869 54.2737 13.2332 54.4896 13.3257C54.7055 13.4105 54.902 13.5531 55.0794 13.7536L54.1311 14.8406C54.0463 14.7481 53.9422 14.6787 53.8189 14.6324C53.7032 14.5862 53.5683 14.5631 53.4141 14.5631C53.0903 14.5631 52.8244 14.6671 52.6162 14.8753C52.4158 15.0757 52.3155 15.3841 52.3155 15.8004ZM59.3585 18.888V15.6848C59.3585 15.3533 59.2544 15.0834 59.0462 14.8753C58.8381 14.6671 58.5682 14.5631 58.2367 14.5631C58.0209 14.5631 57.8281 14.6093 57.6585 14.7018C57.4889 14.7943 57.354 14.9254 57.2538 15.095C57.1613 15.2646 57.115 15.4612 57.115 15.6848L56.5253 15.3841C56.5253 14.9447 56.6178 14.5631 56.8028 14.2393C56.9955 13.9078 57.2576 13.6495 57.5892 13.4645C57.9284 13.2794 58.31 13.1869 58.734 13.1869C59.1426 13.1869 59.5088 13.291 59.8326 13.4992C60.1564 13.6996 60.4108 13.9656 60.5958 14.2971C60.7808 14.6209 60.8734 14.9717 60.8734 15.3494V18.888H59.3585ZM55.6001 18.888V13.3026H57.115V18.888H55.6001ZM62.0936 16.6215V15.2453H66.0947V16.6215H62.0936ZM67.5971 18.888V10.7585H69.1698V18.888H67.5971ZM68.7535 15.5576V14.1583H72.8472V15.5576H68.7535ZM68.7535 12.1462V10.7585H73.0438V12.1462H68.7535ZM76.276 19.0037C75.7671 19.0037 75.3084 18.8765 74.8998 18.622C74.4912 18.3676 74.1713 18.0207 73.94 17.5813C73.7087 17.1418 73.5931 16.6484 73.5931 16.1011C73.5931 15.546 73.7087 15.0487 73.94 14.6093C74.1713 14.1699 74.4912 13.823 74.8998 13.5685C75.3084 13.3141 75.7671 13.1869 76.276 13.1869C76.6768 13.1869 77.0353 13.2679 77.3514 13.4298C77.6675 13.5917 77.9181 13.8191 78.1031 14.1121C78.2958 14.3973 78.3999 14.7211 78.4153 15.0834V17.0956C78.3999 17.4656 78.2958 17.7933 78.1031 18.0785C77.9181 18.3638 77.6675 18.5912 77.3514 18.7608C77.0353 18.9227 76.6768 19.0037 76.276 19.0037ZM76.5535 17.6044C76.9775 17.6044 77.3206 17.4656 77.5827 17.1881C77.8448 16.9029 77.9759 16.5367 77.9759 16.0895C77.9759 15.7966 77.9142 15.5383 77.7908 15.3147C77.6752 15.0834 77.5095 14.9061 77.2936 14.7828C77.0854 14.6517 76.8387 14.5862 76.5535 14.5862C76.276 14.5862 76.0293 14.6517 75.8134 14.7828C75.6052 14.9061 75.4395 15.0834 75.3161 15.3147C75.2005 15.5383 75.1427 15.7966 75.1427 16.0895C75.1427 16.3902 75.2005 16.6562 75.3161 16.8874C75.4395 17.111 75.6052 17.2883 75.8134 17.4194C76.0293 17.5427 76.276 17.6044 76.5535 17.6044ZM77.8949 18.888V17.3847L78.1378 16.0201L77.8949 14.6787V13.3026H79.3983V18.888H77.8949ZM80.7385 18.888V13.3026H82.265V18.888H80.7385ZM81.5018 12.4006C81.2551 12.4006 81.0508 12.3196 80.8889 12.1577C80.727 11.9881 80.646 11.78 80.646 11.5333C80.646 11.2943 80.727 11.09 80.8889 10.9204C81.0508 10.7508 81.2551 10.666 81.5018 10.666C81.7562 10.666 81.9605 10.7508 82.1147 10.9204C82.2766 11.09 82.3575 11.2943 82.3575 11.5333C82.3575 11.78 82.2766 11.9881 82.1147 12.1577C81.9605 12.3196 81.7562 12.4006 81.5018 12.4006ZM83.607 18.888V13.3026H85.1219V18.888H83.607ZM85.1219 15.8004L84.5321 15.4072C84.6015 14.7211 84.802 14.1814 85.1335 13.7883C85.465 13.3874 85.943 13.1869 86.5674 13.1869C86.8372 13.1869 87.0801 13.2332 87.296 13.3257C87.5118 13.4105 87.7084 13.5531 87.8857 13.7536L86.9375 14.8406C86.8527 14.7481 86.7486 14.6787 86.6252 14.6324C86.5096 14.5862 86.3747 14.5631 86.2205 14.5631C85.8967 14.5631 85.6307 14.6671 85.4226 14.8753C85.2221 15.0757 85.1219 15.3841 85.1219 15.8004Z"
diff --git a/src/components/BackButton.tsx b/src/components/BackButton.tsx
index 52234560a..cde319d60 100644
--- a/src/components/BackButton.tsx
+++ b/src/components/BackButton.tsx
@@ -42,7 +42,7 @@ const BackButton: React.FC<Props> = ({ onPress, previousFallbackRoute: fallback
     };
     return (
         <Button variant="none" size="icon" onClick={handleOnBack}>
-            <IconArrowLeft size={24} />
+            <IconArrowLeft size={26} style={{ strokeWidth: '1.5px' }} />
         </Button>
     );
 };
diff --git a/src/components/HeaderCard.tsx b/src/components/HeaderCard.tsx
index d78a3731a..83e2cf713 100644
--- a/src/components/HeaderCard.tsx
+++ b/src/components/HeaderCard.tsx
@@ -1,5 +1,6 @@
 import { ReactNode } from 'react';
 import BackButton from './BackButton';
+import { NavLink } from 'react-router-dom';
 import Loki from '../assets/icons/loki.svg';
 
 type Props = {
@@ -23,17 +24,19 @@ const HeaderCard: React.FC<Props> = ({ children, leftContent, rightContent, onBa
             <div className="h-14 bg-primary-light fixed py-4 z-50 top-0 left-0 right-0">
                 <div className="flex items-center justify-between h-full px-4">
                     <div className="flex items-center">
-                        {showBack && <BackButton onPress={onBack} previousFallbackRoute={previousFallbackRoute} />}
-                        <Loki className="hidden lg:block" />
+                        <div className={showBack ? '' : 'invisible'}>
+                            <BackButton onPress={onBack} previousFallbackRoute={previousFallbackRoute} />
+                        </div>
+                        <NavLink to="/start" className="ml-1">
+                            <Loki className="w-[106px] h-[34px] lg:w-[125px] lg:h-[40px]" />
+                        </NavLink>
                     </div>
-                    <div className="flex flex-row items-center justify-between w-full lg:hidden">
-                        <div className="flex items-center">
-                            {rightContent}
-                            {!showBack && <Loki className="lg:hidden" />}
+                    <div className="flex flex-row items-center justify-end w-full md:hidden">
+                        <div className="flex flex-row items-center">
+                            {leftContent} {rightContent}
                         </div>
-                        <div className="flex flex-row items-center">{leftContent}</div>
                     </div>
-                    <div className="flex-row justify-end hidden lg:flex">
+                    <div className="flex-row justify-end hidden md:flex">
                         <div>{leftContent}</div>
                         <div>{rightContent}</div>
                     </div>
diff --git a/src/pages/pupil/single-course/PupilCourseButtons.tsx b/src/pages/pupil/single-course/PupilCourseButtons.tsx
index 288869fea..eb7190834 100644
--- a/src/pages/pupil/single-course/PupilCourseButtons.tsx
+++ b/src/pages/pupil/single-course/PupilCourseButtons.tsx
@@ -187,7 +187,7 @@ const PupilCourseButtons: React.FC<ActionButtonProps> = ({ subcourse, refresh, i
                     {t(`lernfair.reason.course.pupil.${subcourse.canJoin.reason as CanJoinReason}`)}
                 </Alert>
             )}
-            <div className="flex flex-col items-center gap-y-4 md:flex-row md:gap-x-4 md:flex-wrap lg:w-1/2">
+            <div className="flex flex-col items-stretch lg:items-center gap-y-4 md:flex-row md:gap-x-4 md:flex-wrap lg:w-1/2">
                 {!subcourse.isParticipant && subcourse.canJoin?.allowed && (
                     <Button
                         disabled={loadingSubcourseJoined}
diff --git a/src/widgets/AppointmentCard.tsx b/src/widgets/AppointmentCard.tsx
index 198a3971b..e893b0ffb 100644
--- a/src/widgets/AppointmentCard.tsx
+++ b/src/widgets/AppointmentCard.tsx
@@ -402,6 +402,7 @@ const AppointmentCard: React.FC<Props> = ({
                                             duration={duration}
                                             isInstructor={isOrganizer}
                                             canJoin={isCurrent}
+                                            className="w-full h-[47px] rounded-[4px]"
                                         />
                                     </VStack>
                                 )}