diff --git a/Resources/Private/Partials/Bootstrap5/Job.html b/Resources/Private/Partials/Bootstrap5/Job.html
index 410ed0bc0dc45acca106b1e1cbc8b948135bd611..0112975b7579f7f51add830e07b82df20925b2d2 100644
--- a/Resources/Private/Partials/Bootstrap5/Job.html
+++ b/Resources/Private/Partials/Bootstrap5/Job.html
@@ -31,9 +31,9 @@
                 </ul>
 			</f:if>
         </div>
-        <div class="card-footer bg-light text-center">
+        <div class="card-footer bg-default text-center">
             <f:link.action id="offer-{job.uid}" pageUid="{settings.applyPage}" controller="Joblist" action="applyForm"
-                pluginName="JobApplication" arguments="{jobId: job.uid}" class="btn btn-default stretched-link w-100">
+                pluginName="JobApplication" arguments="{jobId: job.uid}" class="btn btn-default stretched-link w-100 text-uppercase fw-bold">
                 <f:format.raw>
                     <f:translate key="frontend.jobDetailsCta" />
                 </f:format.raw>
diff --git a/Resources/Private/Partials/Bootstrap5/Teaser.html b/Resources/Private/Partials/Bootstrap5/Teaser.html
index fac1d1531cecf2469a6f777555c62e06bbd18d5a..5a808742a156decbb0c0fb4db26945144dee8f2f 100644
--- a/Resources/Private/Partials/Bootstrap5/Teaser.html
+++ b/Resources/Private/Partials/Bootstrap5/Teaser.html
@@ -1,13 +1,13 @@
 <div class="col-md">
-	<div class="default-content-element">
+    <div class="default-content-element">
         <div class="card shadow-small border-top">
             <div class="card-header text-center">
                 <h2 class="card-title h4">{job.title}</h2>
             </div>
             <div class="card-body">
                 <f:if condition="{job.description}">
-					<f:format.html parseFuncTSPath="lib.parseFunc_RTE">{job.description}</f:format.html>
-				</f:if>
+                    <f:format.html parseFuncTSPath="lib.parseFunc_RTE">{job.description}</f:format.html>
+                </f:if>
                 <f:if condition="{job.qualification}">
                     <div class="sgjobs-highlight-area">
                         <ul>
@@ -22,26 +22,28 @@
                                     </f:else>
                                 </f:if>
                             </li>
-                            <li>
-                                <f:for each="{job.companies}" as="company" iteration="iterator">
-                                    {company.city}{f:if(condition: '!{iterator.isLast} || {iterator.isLast} && {job.telecommutePossible} ', then: ', ')}
-                                </f:for>
-                                <f:if condition="{job.telecommutePossible}">
-                                    <f:translate key="frontend.remote" />
-                                </f:if>
-                            </li>
+                            <f:if condition="{job.companies} || {job.telecommutePossible}">
+                                <li>
+                                    <f:for each="{job.companies}" as="company" iteration="iterator">
+                                        {company.city}{f:if(condition: '!{iterator.isLast} || {iterator.isLast} && {job.telecommutePossible} ', then: ', ')}
+                                    </f:for>
+                                    <f:if condition="{job.telecommutePossible}">
+                                        <f:translate key="frontend.remote" />
+                                    </f:if>
+                                </li>
+                            </f:if>
                         </ul>
                     </div>
                 </f:if>
             </div>
-            <div class="card-footer bg-light text-center">
-                <f:link.action class="sg-jobs-job card shadow-small border-top" id="offer-{job.uid}" pageUid="{applyPageUid}" controller="Joblist" action="applyForm"
-					   pluginName="JobApplication" arguments="{jobId: job.uid}" class="btn btn-default stretched-link w-100">
+            <div class="card-footer bg-default text-center">
+                <f:link.action class="sg-jobs-job card shadow-small" id="offer-{job.uid}" pageUid="{applyPageUid}" controller="Joblist" action="applyForm"
+                       pluginName="JobApplication" arguments="{jobId: job.uid}" class="btn btn-default stretched-link w-100 text-uppercase fw-bold">
                     <f:format.raw>
                         <f:translate key="frontend.jobDetailsCta" />
                     </f:format.raw>
                 </f:link.action>
             </div>
         </div>
-	</div>
+    </div>
 </div>