diff --git a/front/src/components/ui/Card.vue b/front/src/components/ui/Card.vue
index e83cb0e91..3d45b9e51 100644
--- a/front/src/components/ui/Card.vue
+++ b/front/src/components/ui/Card.vue
@@ -16,17 +16,15 @@ const props = defineProps<{
   tags?: string[]
   image?: string | { src: string, style?: "withPadding" }
   icon?: string
-} & {
-  [Size in 'small' | 'auto']?: true
-} & Partial<RouterLinkProps> & (PastelProps | ColorProps | DefaultProps) & RaisedProps & VariantProps>()
+} & ({
+  [Width in 'small' | 'auto']?: true
+} | { width: string }) & Partial<RouterLinkProps> & (PastelProps | ColorProps | DefaultProps) & RaisedProps & VariantProps>()
 
 const image = typeof props.image === 'string' ? { src: props.image } : props.image
 
 const isExternalLink = computed(() => {
   return typeof props.to === 'string' && props.to.startsWith('http')
 })
-
-// const fallbackWidth =
 </script>
 
 <template>
@@ -48,7 +46,7 @@ const isExternalLink = computed(() => {
     </div>
     <img v-else-if="image" :src="image?.src"
       :class="{ [$style.image]: true, [$style['with-padding']]: image?.style === 'withPadding' }" />
-    <Spacer v-else :size="props.small? 4 : 12" />
+    <Spacer v-else :size="'small' in props ? 4 : 12" />
 
     <!-- Icon -->
 
@@ -74,6 +72,8 @@ const isExternalLink = computed(() => {
       <slot />
     </Layout>
 
+    <Spacer grow :size="0" />
+
     <!-- Footer and Action -->
     <div v-if="$slots.footer" :class="$style.footer">
       <slot name="footer" />
@@ -83,7 +83,7 @@ const isExternalLink = computed(() => {
       <slot name="action" />
     </div>
 
-    <Spacer v-if="!$slots.footer && !$slots.action" :size="props.small? 8 : 16" />
+    <Spacer v-if="!$slots.footer && !$slots.action" :size="'small' in props? 8 : 16" />
 
   </Layout>
 </template>
@@ -91,7 +91,7 @@ const isExternalLink = computed(() => {
 <style module>
 .card {
   /* Override --width with your preferred value */
-  --fw-card-width: var(--width, v-bind("props.small ? 'min-content' : props.auto ? 'auto' : '320px'"));
+  --fw-card-width: var(--width, v-bind("'small' in props ? 'min-content' : 'auto' in props ? 'auto' : props.width || '320px'"));
   --fw-card-padding: v-bind("props.small ? '16px' : '24px'");
 
   position: relative;
@@ -138,6 +138,12 @@ const isExternalLink = computed(() => {
 
   >.icon {
     position: absolute;
+    top: 22px;
+    right: 22px;
+
+    font-size: 1rem;
+  }
+  &:has(>.image)>.icon {
     top: var(--fw-card-padding);
     right: var(--fw-card-padding);
 
@@ -145,6 +151,7 @@ const isExternalLink = computed(() => {
   }
 
   >.title {
+    margin: 0;
     padding: 0 var(--fw-card-padding);
     line-height: 1.3em;
     font-size: 1.125em;
@@ -155,10 +162,12 @@ const isExternalLink = computed(() => {
     overflow: hidden;
     flex-shrink: 0;
   }
-
+  &:has(>.icon)>.title {
+    padding-right:calc(var(--fw-card-padding) + 22px);
+  }
   &.is-category>.title {
     font-size: 1.75em;
-    padding-bottom: .25em;
+    padding-bottom: .125em;
   }
 
   >.alert {
diff --git a/front/src/components/ui/Link.vue b/front/src/components/ui/Link.vue
index 28dd8a301..629816cff 100644
--- a/front/src/components/ui/Link.vue
+++ b/front/src/components/ui/Link.vue
@@ -5,7 +5,7 @@ import { type ColorProps, type DefaultProps, type VariantProps, propsToColor } f
 
 const { to, icon, thickWhenActive, round, ...colorProps } = defineProps<{
     width?: 'standard' | 'auto' | 'full'
-    alignText?: 'left' | 'center' | 'right'
+    alignText?: 'left' | 'center' | 'right' | 'stretch'
     alignSelf?: 'start' | 'center' | 'end'
     thickWhenActive?: true
 
@@ -30,7 +30,7 @@ const isSimple = propsToColor(colorProps).class === ''
       $style.link,
       'is-' + width,
       'is-text-aligned-' + (alignText ?? 'center'),
-      'is-self-aligned-' + (alignSelf ?? 'center'),
+      'is-self-aligned-' + (alignSelf ?? 'left'),
       round && $style['is-round'],
       isIconOnly && $style['is-icon-only'],
       isSimple && $style['force-underline'],
@@ -49,9 +49,9 @@ const isSimple = propsToColor(colorProps).class === ''
     v-bind="propsToColor({ ...colorProps, interactive: true })"
     :class="[
       $style.link,
-      'is-' + width,
-      'is-text-aligned-' + (alignText ?? 'center'),
-      'is-self-aligned-' + (alignSelf ?? 'center'),
+      $style['is-' + width],
+      $style['is-text-aligned-' + (alignText ?? 'center')],
+      $style['is-self-aligned-' + (alignSelf ?? 'start')],
       round && $style['is-round'],
       isIconOnly && $style['is-icon-only'],
       isSimple && $style['no-spacing'],
@@ -139,6 +139,12 @@ const isSimple = propsToColor(colorProps).class === ''
       justify-content: flex-end;
     }
 
+    &.is-text-aligned-stretch {
+      justify-content: stretch;
+      align-content: stretch;
+      > span { width:100%; }
+    }
+
     &.is-self-aligned-start {
       align-self: flex-start;
     }