diff --git a/plugins/com.minres.scviewer.e4.application/icons/lightbulb_off.png b/plugins/com.minres.scviewer.e4.application/icons/lightbulb_off.png
new file mode 100644
index 0000000..e95b8c5
Binary files /dev/null and b/plugins/com.minres.scviewer.e4.application/icons/lightbulb_off.png differ
diff --git a/plugins/com.minres.scviewer.e4.application/icons/stream.png b/plugins/com.minres.scviewer.e4.application/icons/stream.png
old mode 100755
new mode 100644
index c32d25c..5d59c0e
Binary files a/plugins/com.minres.scviewer.e4.application/icons/stream.png and b/plugins/com.minres.scviewer.e4.application/icons/stream.png differ
diff --git a/plugins/com.minres.scviewer.e4.application/icons/stream_hier.png b/plugins/com.minres.scviewer.e4.application/icons/stream_hier.png
new file mode 100755
index 0000000..93bdec4
Binary files /dev/null and b/plugins/com.minres.scviewer.e4.application/icons/stream_hier.png differ
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
index df52c1a..2a44844 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
@@ -52,12 +52,17 @@ public class TxDbLabelProvider implements ILabelProvider {
 	/**
 	 * Instantiates a new tx db label provider.
 	 */
-	public TxDbLabelProvider() {
+	public TxDbLabelProvider(boolean isTree) {
 		super();
 		loadinDatabase=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/database_go.png"); //$NON-NLS-1$ //$NON-NLS-2$
 		database=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/database.png"); //$NON-NLS-1$ //$NON-NLS-2$
-		stream=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/stream.png"); //$NON-NLS-1$ //$NON-NLS-2$
 		folder=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/folder.png"); //$NON-NLS-1$ //$NON-NLS-2$
+		if(isTree) {
+			stream=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/stream_hier.png"); //$NON-NLS-1$ //$NON-NLS-2$
+		} else {
+			stream=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/stream.png"); //$NON-NLS-1$ //$NON-NLS-2$
+			
+		}
 		signal=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/signal.png"); //$NON-NLS-1$ //$NON-NLS-2$
 		wave=ResourceManager.getPluginImage(Constants.PLUGIN_ID, "icons/wave.png"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
@@ -134,7 +139,7 @@ public class TxDbLabelProvider implements ILabelProvider {
 			case FILTER:
 				break;
 			case SIGNAL:
-				if(((IWaveform) element).getWidth()==1)
+				if(((IWaveform) element).getRowCount()==1)
 					return signal;
 				else 
 					return wave;
@@ -159,7 +164,11 @@ public class TxDbLabelProvider implements ILabelProvider {
 	 */
 	@Override
 	public String getText(Object element) {
-		return ((IHierNode)element).getName();
+		if(element instanceof IWaveformDb){
+			IWaveformDb db = (IWaveformDb) element;
+			return db.getName()+(db.isLoaded()?"":" (loading)");
+		} else
+			return ((IHierNode)element).getName();
 	}
 
 }