diff --git a/piflow-bundle/src/main/resources/icon/solr/GetSolr.png b/piflow-bundle/src/main/resources/icon/solr/GetSolr.png
new file mode 100644
index 0000000..f2efd83
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/solr/GetSolr.png differ
diff --git a/piflow-bundle/src/main/resources/icon/solr/PutSolr.png b/piflow-bundle/src/main/resources/icon/solr/PutSolr.png
new file mode 100644
index 0000000..f44af82
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/solr/PutSolr.png differ
diff --git a/piflow-bundle/src/main/resources/icon/streaming/FlumeStream.png b/piflow-bundle/src/main/resources/icon/streaming/FlumeStream.png
new file mode 100644
index 0000000..52dc107
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/streaming/FlumeStream.png differ
diff --git a/piflow-bundle/src/main/resources/icon/streaming/KafkaStream.png b/piflow-bundle/src/main/resources/icon/streaming/KafkaStream.png
new file mode 100644
index 0000000..9da830e
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/streaming/KafkaStream.png differ
diff --git a/piflow-bundle/src/main/resources/icon/streaming/SocketTextStream.png b/piflow-bundle/src/main/resources/icon/streaming/SocketTextStream.png
new file mode 100644
index 0000000..8bd4074
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/streaming/SocketTextStream.png differ
diff --git a/piflow-bundle/src/main/resources/icon/streaming/SocketTextStreamByWindow.png b/piflow-bundle/src/main/resources/icon/streaming/SocketTextStreamByWindow.png
new file mode 100644
index 0000000..a7771cb
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/streaming/SocketTextStreamByWindow.png differ
diff --git a/piflow-bundle/src/main/resources/icon/streaming/TextFileStream.png b/piflow-bundle/src/main/resources/icon/streaming/TextFileStream.png
new file mode 100644
index 0000000..65ffacc
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/streaming/TextFileStream.png differ
diff --git a/piflow-bundle/src/main/resources/icon/streaming/flumeStream.png b/piflow-bundle/src/main/resources/icon/streaming/flumeStream.png
deleted file mode 100644
index 868a97a..0000000
Binary files a/piflow-bundle/src/main/resources/icon/streaming/flumeStream.png and /dev/null differ
diff --git a/piflow-bundle/src/main/resources/icon/streaming/kafkaStream.png b/piflow-bundle/src/main/resources/icon/streaming/kafkaStream.png
deleted file mode 100644
index e2f9ca3..0000000
Binary files a/piflow-bundle/src/main/resources/icon/streaming/kafkaStream.png and /dev/null differ
diff --git a/piflow-bundle/src/main/resources/icon/streaming/socketTextStream.png b/piflow-bundle/src/main/resources/icon/streaming/socketTextStream.png
deleted file mode 100644
index 4013797..0000000
Binary files a/piflow-bundle/src/main/resources/icon/streaming/socketTextStream.png and /dev/null differ
diff --git a/piflow-bundle/src/main/resources/icon/streaming/textFileStream.png b/piflow-bundle/src/main/resources/icon/streaming/textFileStream.png
deleted file mode 100644
index 3a64c22..0000000
Binary files a/piflow-bundle/src/main/resources/icon/streaming/textFileStream.png and /dev/null differ
diff --git a/piflow-bundle/src/main/resources/icon/xml/FlattenXmlParser.png b/piflow-bundle/src/main/resources/icon/xml/FlattenXmlParser.png
new file mode 100644
index 0000000..703e6c8
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/xml/FlattenXmlParser.png differ
diff --git a/piflow-bundle/src/main/resources/icon/xml/FolderXmlParser.png b/piflow-bundle/src/main/resources/icon/xml/FolderXmlParser.png
new file mode 100644
index 0000000..94682ef
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/xml/FolderXmlParser.png differ
diff --git a/piflow-bundle/src/main/resources/icon/xml/XmlParser.png b/piflow-bundle/src/main/resources/icon/xml/XmlParser.png
new file mode 100644
index 0000000..6ba65d1
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/xml/XmlParser.png differ
diff --git a/piflow-bundle/src/main/resources/icon/xml/XmlSave.png b/piflow-bundle/src/main/resources/icon/xml/XmlSave.png
new file mode 100644
index 0000000..74d0b3b
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/xml/XmlSave.png differ
diff --git a/piflow-bundle/src/main/resources/icon/xml/XmlStringParser.png b/piflow-bundle/src/main/resources/icon/xml/XmlStringParser.png
new file mode 100644
index 0000000..9dd6082
Binary files /dev/null and b/piflow-bundle/src/main/resources/icon/xml/XmlStringParser.png differ
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/solr/GetFromSolr.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/solr/GetFromSolr.scala
index 2a7eea8..51e7949 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/solr/GetFromSolr.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/solr/GetFromSolr.scala
@@ -135,7 +135,7 @@ class GetFromSolr extends ConfigurableStop{
 
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("solr.png")
+    ImageUtil.getImage("icon/solr/GetSolr.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/solr/PutIntoSolr.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/solr/PutIntoSolr.scala
index 6a46db3..2dd005d 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/solr/PutIntoSolr.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/solr/PutIntoSolr.scala
@@ -54,7 +54,7 @@ class PutIntoSolr extends ConfigurableStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("solr.png")
+    ImageUtil.getImage("icon/solr/PutSolr.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/FlumeStream.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/FlumeStream.scala
index 5cf8a5c..718cf49 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/FlumeStream.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/FlumeStream.scala
@@ -38,7 +38,7 @@ class FlumeStream extends ConfigurableStreamingStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("icon/streaming/flumeStream.png")
+    ImageUtil.getImage("icon/streaming/FlumeStream.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/KafkaStream.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/KafkaStream.scala
index 3015a2b..96e5789 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/KafkaStream.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/KafkaStream.scala
@@ -44,7 +44,7 @@ class KafkaStream extends ConfigurableStreamingStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("icon/streaming/kafkaStream.png")
+    ImageUtil.getImage("icon/streaming/KafkaStream.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/SocketTextStream.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/SocketTextStream.scala
index 2549c1e..d97fc10 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/SocketTextStream.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/SocketTextStream.scala
@@ -43,7 +43,7 @@ class SocketTextStream extends ConfigurableStreamingStop {
 
   //TODO: change icon
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("icon/streaming/socketTextStream.png")
+    ImageUtil.getImage("icon/streaming/SocketTextStream.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/SocketTextStreamByWindow.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/SocketTextStreamByWindow.scala
index 2e7e091..bceaf78 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/SocketTextStreamByWindow.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/SocketTextStreamByWindow.scala
@@ -45,7 +45,7 @@ class SocketTextStreamByWindow extends ConfigurableStreamingStop {
 
   //TODO: change icon
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("icon/streaming/socketTextStream.png")
+    ImageUtil.getImage("icon/streaming/SocketTextStreamByWindow.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/TextFileStream.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/TextFileStream.scala
index caf691c..8dc0baf 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/TextFileStream.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/streaming/TextFileStream.scala
@@ -33,7 +33,7 @@ class TextFileStream extends ConfigurableStreamingStop{
 
   //TODO: change icon
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("icon/streaming/textFileStream.png")
+    ImageUtil.getImage("icon/streaming/TextFileStream.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FlattenXmlParser.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FlattenXmlParser.scala
index 1cf1dcc..1651be5 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FlattenXmlParser.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FlattenXmlParser.scala
@@ -168,7 +168,7 @@ class FlattenXmlParser extends ConfigurableStop{
     descriptor
   }
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("xml.png")
+    ImageUtil.getImage("icon/xml/FlattenXmlParser.png")
   }
   override def getGroup(): List[String] = {
     List(StopGroup.XmlGroup.toString)
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FolderXmlParser.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FolderXmlParser.scala
index 78f9521..29f9f8d 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FolderXmlParser.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FolderXmlParser.scala
@@ -47,7 +47,7 @@ class FolderXmlParser extends ConfigurableStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("xml.png")
+    ImageUtil.getImage("icon/xml/FolderXmlParser.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlParser.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlParser.scala
index a76e5d1..60d7c47 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlParser.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlParser.scala
@@ -57,7 +57,7 @@ class XmlParser extends ConfigurableStop {
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("xml.png")
+    ImageUtil.getImage("icon/xml/XmlParser.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlSave.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlSave.scala
index 363224b..316cd93 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlSave.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlSave.scala
@@ -40,7 +40,7 @@ class XmlSave extends ConfigurableStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("xml.png")
+    ImageUtil.getImage("icon/xml/XmlSave.png")
   }
 
   override def getGroup(): List[String] = {
diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlStringParser.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlStringParser.scala
index 257915d..e7bbb02 100644
--- a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlStringParser.scala
+++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlStringParser.scala
@@ -110,7 +110,7 @@ class XmlStringParser extends ConfigurableStop {
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("xml.png")
+    ImageUtil.getImage("icon/xml/XmlStringParser.png")
   }
 
   override def getGroup(): List[String] = {