diff --git a/frontend/src/pages/GoalsPage.jsx b/frontend/src/pages/GoalsPage.jsx
index 96d4d4e..275fff5 100644
--- a/frontend/src/pages/GoalsPage.jsx
+++ b/frontend/src/pages/GoalsPage.jsx
@@ -515,9 +515,9 @@ export default function GoalsPage() {
                           <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', gap: 16 }}>
                             <div style={{ flex: 1 }}>
                               <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 8, flexWrap: 'wrap' }}>
-                                <span style={{ fontSize: 20 }}>{typeInfo.icon}</span>
+                                <span style={{ fontSize: 20 }}>{goal.icon || typeInfo.icon}</span>
                                 <span style={{ fontWeight: 600, fontSize: 16 }}>
-                                  {goal.name || typeInfo.label_de}
+                                  {goal.name || goal.label_de || typeInfo.label_de || goal.goal_type}
                                 </span>
                                 <span style={{ fontSize: 16 }} title={priorityInfo.label}>
                                   {priorityInfo.stars}