diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
index 2b5e19b530b4c667e63d6fbd016dac1b792db2cc..df60b22c6dd9c600e4675f53c610801319cfd264 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
@@ -15,7 +15,8 @@ import java.util.Objects;
 @Entity
 public class Account implements ProvidesID, Iconizable
 {
-	private static final String ACCOUNT_FONT_COLOR = "#2E79B9";
+	private static final String FONT_COLOR_LIGHT_THEME = "#212121";
+	private static final String FONT_COLOR_DARK_THEME = "#FFFFFF";
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -162,13 +163,13 @@ public class Account implements ProvidesID, Iconizable
 		final Icon icon = getIconReference();
 		if(icon == null)
 		{
-			return ACCOUNT_FONT_COLOR;
+			return getDefaultFontColor(isDarkTheme);
 		}
 
 		final String fontColor = icon.getFontColor();
 		if(fontColor == null)
 		{
-			return ACCOUNT_FONT_COLOR;
+			return getDefaultFontColor(isDarkTheme);
 		}
 
 		return fontColor;
@@ -177,7 +178,12 @@ public class Account implements ProvidesID, Iconizable
 	@Override
 	public String getDefaultFontColor(boolean isDarkTheme)
 	{
-		return ACCOUNT_FONT_COLOR;
+		if(isDarkTheme)
+		{
+			return FONT_COLOR_DARK_THEME;
+		}
+
+		return FONT_COLOR_LIGHT_THEME;
 	}
 
 	@Override
diff --git a/BudgetMasterServer/src/main/resources/static/css/accounts.css b/BudgetMasterServer/src/main/resources/static/css/accounts.css
index ac8698d3719dc6a1e9cbd3db9f375f76347981ca..189526f803b122181003a095e6a72760905f5131 100644
--- a/BudgetMasterServer/src/main/resources/static/css/accounts.css
+++ b/BudgetMasterServer/src/main/resources/static/css/accounts.css
@@ -28,6 +28,6 @@
 }
 
 .account-square-border {
-    border: 3px solid var(--color-blue);
-    line-height: 28px !important;
+    border: 3px solid var(--color-text);
+    line-height: 32px !important;
 }