diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index be5724c5d..0e3884144 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -1125,7 +1125,8 @@ TCMotorSelPan.btn.close = Close
 PlotDialog.CheckBox.Showdatapoints = Show data points
 PlotDialog.lbl.Chart = left click drag to zoom area. mouse wheel to zoom. ctrl-mouse wheel to zoom x axis only. ctrl-left click drag to pan.  right click drag to zoom dynamically.
 
-
+ComponentTree.ttip.massoverride = mass override
+ComponentTree.ttip.cgoverride = cg override
 ! "main" prefix is used for the main application dialog
 
 # FIXME: Rename the description keys
diff --git a/core/resources/pix/icons/cg-marker.png b/core/resources/pix/icons/cg-marker.png
new file mode 100644
index 000000000..ac25ec655
Binary files /dev/null and b/core/resources/pix/icons/cg-marker.png differ
diff --git a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
index 2ab5a5865..719229d75 100644
--- a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
@@ -2,8 +2,8 @@ package net.sf.openrocket.gui.main.componenttree;
 
 
 
-import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.FlowLayout;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -12,13 +12,17 @@ import javax.swing.UIManager;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
 import net.sf.openrocket.gui.main.ComponentIcons;
-import net.sf.openrocket.rocketcomponent.MassComponent;
+import net.sf.openrocket.gui.util.Icons;
+import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
+import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.TextUtil;
 
 public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
 	
+	private static final Translator trans = Application.getTranslator();
+
 	@Override
 	public Component getTreeCellRendererComponent(
 			JTree tree,
@@ -36,13 +40,18 @@ public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
 		
 		RocketComponent c = (RocketComponent) value;
 
-		if ( c.isMassOverridden() ) {
+		if ( c.isMassOverridden() || c.isCGOverridden()) {
 			JPanel p = new JPanel();
-			p.setLayout( new BorderLayout() );
+			p.setLayout( new FlowLayout( FlowLayout.LEFT, 1,1) );
 			p.setBackground( UIManager.getColor("Tree.textBackground"));
 			p.setForeground( UIManager.getColor("Tree.textForeground"));
-			p.add(comp, BorderLayout.WEST);
-			p.add(new JLabel( ComponentIcons.getSmallIcon(MassComponent.class) ), BorderLayout.EAST );
+			p.add(comp/*, BorderLayout.WEST*/);
+			if ( c.isMassOverridden() ) {
+				p.add( new JLabel( Icons.MASS_OVERRIDE ) );
+			}
+			if ( c.isCGOverridden() ) {
+				p.add( new JLabel(Icons.CG_OVERRIDE) );
+			}
 			p.setToolTipText(getToolTip(c));
 			comp = p;
 		}
@@ -64,7 +73,11 @@ public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
 		}
 		
 		if ( c.isMassOverridden() ) {
-			sb.append(" mass override");
+			sb.append(" ").append(trans.get("ComponentTree.ttip.massoverride"));
+		}
+		
+		if ( c.isCGOverridden() ) {
+			sb.append(" ").append(trans.get("ComponentTree.ttip.cgoverride"));
 		}
 		
 		String comment = c.getComment().trim();
diff --git a/swing/src/net/sf/openrocket/gui/util/Icons.java b/swing/src/net/sf/openrocket/gui/util/Icons.java
index a16836808..5116a1cbf 100644
--- a/swing/src/net/sf/openrocket/gui/util/Icons.java
+++ b/swing/src/net/sf/openrocket/gui/util/Icons.java
@@ -83,6 +83,9 @@ public class Icons {
 	public static final Icon NOT_FAVORITE = loadImageIcon("pix/icons/star_silver.png", "Not favorite");
 	public static final Icon FAVORITE = loadImageIcon("pix/icons/star_gold.png", "Favorite");
 	
+	public static final Icon CG_OVERRIDE = loadImageIcon("pix/icons/cg-marker.png", "CG Override");
+	public static final Icon MASS_OVERRIDE = loadImageIcon("pix/icons/mass-override.png", "Mass Override");
+	
 	
 	static {
 		log.debug("Icons loaded");