diff --git a/frontend/ui/src/components/CardTheme.svelte b/frontend/ui/src/components/CardTheme.svelte
index 75f3dd73..9dac41b6 100644
--- a/frontend/ui/src/components/CardTheme.svelte
+++ b/frontend/ui/src/components/CardTheme.svelte
@@ -38,12 +38,17 @@
                                 <Icon name="heart-fill" />
                             </Badge>
                         {/if}
-                        {#if theme.exercice_coeff_max > 1}
-                            <Badge color="warning">
+                        {#if theme.exercice_coeff_max > 1 || (exercice && exercice.curcoeff > 1)}
+                            <Badge color="success">
                                 <Icon name="gift-fill" />
                             </Badge>
                         {/if}
-                        {#if $myThemes[theme.id].exercice_solved > 0}
+                        {#if exercice && $my && $my.exercices[exercice.id] && $my.exercices[exercice.id].solved_rank}
+                            <Badge color="light" class="text-success fw-bold">
+                                <Icon name="check" />
+                            </Badge>
+                        {/if}
+                        {#if !exercice && $myThemes[theme.id].exercice_solved > 0}
                             <Badge color="light">
                                 {$myThemes[theme.id].exercice_solved}/{theme.exercice_count}
                             </Badge>
diff --git a/frontend/ui/src/routes/index.svelte b/frontend/ui/src/routes/index.svelte
index 22d39207..80b72951 100644
--- a/frontend/ui/src/routes/index.svelte
+++ b/frontend/ui/src/routes/index.svelte
@@ -51,7 +51,7 @@
         {#each Object.keys($themes) as th, index}
             <Col class="mb-3">
             <CardTheme
-                class="{$my && $my.team_id && $myThemes[$themes[th].id].exercice_solved > 0?'border-success ':''}{$themes[th].exercice_coeff_max > 1?'border-warning ':''}"
+                class="{$my && $my.team_id && $myThemes[$themes[th].id].exercice_solved > 0?'border-light ':''}{$themes[th].exercice_coeff_max > 1?'border-success ':''}"
                 theme={$themes[th]}
                        on:click={goto(`${$themes[th].urlid}`)}
             />