diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
index 768786ea48295503bfe338f32cb04b24bff85c79..bbe07a59846b8da18e91f9401acc2bba5dcf52a5 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
@@ -163,6 +163,12 @@ public class Account implements ProvidesID, Iconizable
 		return fontColor;
 	}
 
+	@Override
+	public String getDefaultFontColor(boolean isDarkTheme)
+	{
+		return ACCOUNT_FONT_COLOR;
+	}
+
 	@Override
 	public String toString()
 	{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java b/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java
index 97818717dbc197470cb0d390bbcd0bd569c5de7b..7f2b26dc46dd8510d01a0e78ec49917b5dad4acc 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java
@@ -17,6 +17,9 @@ import java.util.Objects;
 @Entity
 public class Category implements ProvidesID, Iconizable
 {
+	private static final String FONT_COLOR_LIGHT_THEME = "#212121";
+	private static final String FONT_COLOR_DARK_THEME = "#FFFFFF";
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Expose
@@ -127,6 +130,17 @@ public class Category implements ProvidesID, Iconizable
 		return fontColor;
 	}
 
+	@Override
+	public String getDefaultFontColor(boolean isDarkTheme)
+	{
+		if(isDarkTheme)
+		{
+			return FONT_COLOR_DARK_THEME;
+		}
+
+		return FONT_COLOR_LIGHT_THEME;
+	}
+
 	public String getAppropriateTextColor()
 	{
 		return ColorUtilsNonJavaFX.getAppropriateTextColor(new Color(color)).toRGBHexWithoutOpacity();
diff --git a/src/main/java/de/deadlocker8/budgetmaster/icon/Iconizable.java b/src/main/java/de/deadlocker8/budgetmaster/icon/Iconizable.java
index e0daf1b24ce7e0104f890ed2c220942031ef87ab..68d3aaf0dddc4dfa7fd3e5ac7e6e00455182f097 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/icon/Iconizable.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/icon/Iconizable.java
@@ -32,4 +32,6 @@ public interface Iconizable extends ProvidesID
 	}
 
 	String getFontColor(boolean isDarkTheme);
+
+	String getDefaultFontColor(boolean isDarkTheme);
 }
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java b/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
index 07e532d7980eebd992d077d7c8469a65546901a9..b862f621cd9b5d63abef8f1c274d8fc91343a5dd 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
@@ -221,19 +221,20 @@ public class Template implements TransactionBase, Iconizable
 		final Icon icon = getIconReference();
 		if(icon == null)
 		{
-			return getAppropriateTextColor(isDarkTheme);
+			return getDefaultFontColor(isDarkTheme);
 		}
 
 		final String fontColor = icon.getFontColor();
 		if(fontColor == null)
 		{
-			return getAppropriateTextColor(isDarkTheme);
+			return getDefaultFontColor(isDarkTheme);
 		}
 
 		return fontColor;
 	}
 
-	private String getAppropriateTextColor(boolean isDarkTheme)
+	@Override
+	public String getDefaultFontColor(boolean isDarkTheme)
 	{
 		if(isDarkTheme)
 		{
@@ -243,7 +244,6 @@ public class Template implements TransactionBase, Iconizable
 		return FONT_COLOR_LIGHT_THEME;
 	}
 
-
 	public List<Tag> getTags()
 	{
 		return tags;
diff --git a/src/main/resources/static/js/fontColorPicker.js b/src/main/resources/static/js/fontColorPicker.js
index a1db101f2add67e9c35ba603c15422c09a449992..534545e8e1e3c6d7a8708167ac7d3a09d6e85f32 100644
--- a/src/main/resources/static/js/fontColorPicker.js
+++ b/src/main/resources/static/js/fontColorPicker.js
@@ -38,7 +38,7 @@ $(document).ready(function()
             }
             catch(e)
             {
-                appropriateColor = '#2E79B9';
+                appropriateColor = fontColorPickerDefaultColor;
             }
 
             document.getElementById("item-icon-preview").style.color = appropriateColor;
diff --git a/src/main/resources/templates/helpers/fontColorPicker.ftl b/src/main/resources/templates/helpers/fontColorPicker.ftl
index 73af8584bd0d8ec57542ad208289df99fdb0d87d..f0c466c1b02a51eb8ec70f028b9201f290ea3b09 100644
--- a/src/main/resources/templates/helpers/fontColorPicker.ftl
+++ b/src/main/resources/templates/helpers/fontColorPicker.ftl
@@ -2,6 +2,7 @@
 
 <#macro fontColorPicker item>
     <input type="hidden" name="fontColor" id="fontColor" value="${item.getFontColor(settings.isUseDarkTheme())}">
+    <script>fontColorPickerDefaultColor = "${item.getDefaultFontColor(settings.isUseDarkTheme())}"</script>
 
     <div class="row">
         <div class="input-field col s12 m12 l8 offset-l2">