diff --git a/icons/currentMarker.png b/icons/currentMarker.png
new file mode 100644
index 0000000..bdbd6aa
--- /dev/null
+++ b/icons/currentMarker.png
Binary files differ
diff --git a/plugin.xml b/plugin.xml
index 7f5381a..2536e1b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -183,6 +183,7 @@
             markertype="org.ntlab.traceDebugger.dstSideDeltaMarker">
       </imageprovider>
       <imageprovider
+            icon="icons/currentMarker.png"
             id="CurrentMarker"
             markertype="org.ntlab.traceDebugger.currentMarker">
       </imageprovider>
@@ -300,6 +301,7 @@
             colorPreferenceValue="198,219,174"
             highlightPreferenceKey="clhighlight5"
             highlightPreferenceValue="true"
+            icon="icons/currentMarker.png"
             includeOnPreferencePage="true"
             label="CurrentAnnotation"
             overviewRulerPreferenceKey="clruler5"
diff --git a/src/org/ntlab/traceDebugger/Variable.java b/src/org/ntlab/traceDebugger/Variable.java
index 995cc31..3673307 100644
--- a/src/org/ntlab/traceDebugger/Variable.java
+++ b/src/org/ntlab/traceDebugger/Variable.java
@@ -39,8 +39,8 @@
 	public static final String RETURN_VARIABLE_NAME = TraceDebuggerPlugin.isJapanese() ? "�߂�l" : "return";
 	public static final String ARG_VARIABLE_NAME = TraceDebuggerPlugin.isJapanese() ? "����" : "arg";
 	public static final String RECEIVER_VARIABLE_NAME = TraceDebuggerPlugin.isJapanese() ? "���V�[�o" : "receiver";
-	public static final String VALUE_VARIABLE_NAME = TraceDebuggerPlugin.isJapanese() ? "�R���|�[�l���g" : "value";
-	public static final String CONTAINER_VARIABLE_NAME = TraceDebuggerPlugin.isJapanese() ? "�R���e�i" : "container";
+	public static final String VALUE_VARIABLE_NAME = TraceDebuggerPlugin.isJapanese() ? "�Q�Ɛ�" : "referred";
+	public static final String CONTAINER_VARIABLE_NAME = TraceDebuggerPlugin.isJapanese() ? "�Q�ƌ�" : "referring";
 
 	public enum VariableType {
 		USE_VALUE, USE_CONTAINER, USE_RECEIVER, USE_RETURN,
diff --git a/src/org/ntlab/traceDebugger/Variables.java b/src/org/ntlab/traceDebugger/Variables.java
index 13cd031..61335f7 100644
--- a/src/org/ntlab/traceDebugger/Variables.java
+++ b/src/org/ntlab/traceDebugger/Variables.java
@@ -295,12 +295,12 @@
 				}
 			} 
 		}
-		if (parentNodeNameOfUseSide != null) {
-			setSpecialVariableNodes(parentNodeNameOfUseSide, specialVariablesOfUseSide);
-		}	
 		if (parentNodeNameOfDefSide != null) {
 			setSpecialVariableNodes(parentNodeNameOfDefSide, specialVariablesDefSide);
-		}		
+		}
+		if (parentNodeNameOfUseSide != null) {
+			setSpecialVariableNodes(parentNodeNameOfUseSide, specialVariablesOfUseSide);
+		}
 	}
 	
 	private void setSpecialVariableNodes(String parentNodeName, List<Variable> specialVariables) {