diff --git a/modules/editor/components/emoticon/emoticon.class.php b/modules/editor/components/emoticon/emoticon.class.php
index 7f4eb108e..ed001b225 100644
--- a/modules/editor/components/emoticon/emoticon.class.php
+++ b/modules/editor/components/emoticon/emoticon.class.php
@@ -10,6 +10,7 @@
         // editor_sequence 는 에디터에서 필수로 달고 다녀야 함....
         var $editor_sequence = 0;
         var $component_path = '';
+        var $emoticon_path = '';
 
         /**
          * @brief editor_sequence과 컴포넌트의 경로를 받음
@@ -17,31 +18,34 @@
         function emoticon($editor_sequence, $component_path) {
             $this->editor_sequence = $editor_sequence;
             $this->component_path = $component_path;
+            $this->emoticon_path = sprintf('%s%s/images',eregi_replace('^\.\/','',$this->component_path),'tpl','images');
+        }
+
+        /**
+         * @brief 이모티콘 파일 목록을 리턴
+         **/
+        function getEmoticonList() {
+            $emoticon = Context::get('emoticon');
+            if(!$emoticon || !eregi("^([a-z0-9\_]+)$",$emoticon)) return new Object(-1,'msg_invalid_request');
+
+            $list = $this->getEmoticons($emoticon);
+
+            $this->add('emoticons', implode("\n",$list));
         }
 
 		/**
 		* @brief 재귀적으로 이모티콘이 될 법한 파일들을 하위 디렉토리까지 전부 검색한다. 8,000개까지는 테스트 해봤는데 스택오버프로우를 일으킬지 어떨지는 잘 모르겠음.(2007.9.6, 베니)
 		**/
-		function getEmoticons($path, $source_path) {
-            $path = ereg_replace('\/$','',$path);
+		function getEmoticons($path) {
+            $emoticon_path = sprintf("%s/%s", $this->emoticon_path, $path);
             $output = array();
 
-            $oDir = dir($path);
+            $oDir = dir($emoticon_path);
             while($file = $oDir->read()) {
-                if(in_array($file, array('.','..'))) continue;
-
-                $new_path = $path.'/'.$file;
-
-                if(is_dir($new_path)) {
-                    $sub_output = $this->getEmoticons($new_path, $source_path);
-                    if(is_array($sub_output) && count($sub_output)) $output = array_merge($output, $sub_output);
-                }
-
-                if(eregi('(jpg|jpeg|gif|png)$',$new_path)) $output[] = str_replace($source_path.'/', '', $new_path);
+                if(substr($file,0,1)=='.') continue;
+                if(eregi('\.(jpg|jpeg|gif|png)$',$file)) $output[] = sprintf("%s/%s", $path, str_replace($this->emoticon_path,'',$file));
             }
-
             $oDir->close();
-
             return $output;
 		}
 		
@@ -49,18 +53,18 @@
          * @brief popup window요청시 popup window에 출력할 내용을 추가하면 된다
          **/
         function getPopupContent() {
+            // 이모티콘 디렉토리 목록을 가져옴
+            $emoticon_list = FileHandler::readDir($this->emoticon_path);
+            Context::set('emoticon_list', $emoticon_list);
+
+            // 첫번째 이모티콘 디렉토리의 이미지 파일을 구함
+            $emoticons = $this->getEmoticons($emoticon_list[0]);
+            Context::set('emoticons', $emoticons);
+
             // 템플릿을 미리 컴파일해서 컴파일된 소스를 return
             $tpl_path = $this->component_path.'tpl';
             $tpl_file = 'popup.html';
 
-            Context::set("tpl_path", $tpl_path);
-
-            // 이모티콘을 모두 가져옴
-
-            $emoticon_path = sprintf('%s%s/images',eregi_replace('^\.\/','',$this->component_path),'tpl','images');
-			$emoticon_list = $this->getEmoticons($emoticon_path, $emoticon_path);
-            Context::set('emoticon_list', $emoticon_list);
-
             $oTemplate = &TemplateHandler::getInstance();
             return $oTemplate->compile($tpl_path, $tpl_file);
         }
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (1).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (1).gif
new file mode 100644
index 000000000..12fa2e5ec
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (1).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (10).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (10).gif
new file mode 100644
index 000000000..18559a431
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (10).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (11).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (11).gif
new file mode 100644
index 000000000..1ae330318
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (11).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (12).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (12).gif
new file mode 100644
index 000000000..5af5f65bf
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (12).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (13).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (13).gif
new file mode 100644
index 000000000..f24320359
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (13).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (14).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (14).gif
new file mode 100644
index 000000000..afbc29c48
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (14).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (15).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (15).gif
new file mode 100644
index 000000000..4c522758b
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (15).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (16).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (16).gif
new file mode 100644
index 000000000..4cd7e9f32
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (16).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (17).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (17).gif
new file mode 100644
index 000000000..709727b84
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (17).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (18).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (18).gif
new file mode 100644
index 000000000..1504f5b2d
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (18).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (19).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (19).gif
new file mode 100644
index 000000000..024fd6c02
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (19).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (2).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (2).gif
new file mode 100644
index 000000000..eef7c164b
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (2).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (20).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (20).gif
new file mode 100644
index 000000000..bec5cf472
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (20).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (21).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (21).gif
new file mode 100644
index 000000000..8700419c5
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (21).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (22).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (22).gif
new file mode 100644
index 000000000..435a57c26
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (22).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (23).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (23).gif
new file mode 100644
index 000000000..c1e628bd0
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (23).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (24).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (24).gif
new file mode 100644
index 000000000..4760fe527
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (24).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (25).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (25).gif
new file mode 100644
index 000000000..7ac75cf23
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (25).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (26).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (26).gif
new file mode 100644
index 000000000..6f1ef7fe9
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (26).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (27).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (27).gif
new file mode 100644
index 000000000..266e7a24f
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (27).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (28).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (28).gif
new file mode 100644
index 000000000..7b79f086f
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (28).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (29).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (29).gif
new file mode 100644
index 000000000..3974913f8
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (29).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (3).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (3).gif
new file mode 100644
index 000000000..2cbdd2fc8
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (3).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (30).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (30).gif
new file mode 100644
index 000000000..84627561c
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (30).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (31).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (31).gif
new file mode 100644
index 000000000..a8c243103
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (31).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (32).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (32).gif
new file mode 100644
index 000000000..4e5ed30af
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (32).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (33).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (33).gif
new file mode 100644
index 000000000..b06ffc51c
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (33).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (34).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (34).gif
new file mode 100644
index 000000000..7c8aaa859
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (34).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (35).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (35).gif
new file mode 100644
index 000000000..ce7fa09ca
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (35).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (36).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (36).gif
new file mode 100644
index 000000000..3e0f77729
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (36).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (37).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (37).gif
new file mode 100644
index 000000000..c6fd22eb3
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (37).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (38).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (38).gif
new file mode 100644
index 000000000..245ac15f8
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (38).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (39).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (39).gif
new file mode 100644
index 000000000..778bc4815
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (39).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (4).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (4).gif
new file mode 100644
index 000000000..986b70cfd
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (4).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (40).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (40).gif
new file mode 100644
index 000000000..fc45cdb5e
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (40).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (41).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (41).gif
new file mode 100644
index 000000000..c7a24dc22
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (41).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (42).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (42).gif
new file mode 100644
index 000000000..ed6316663
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (42).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (43).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (43).gif
new file mode 100644
index 000000000..9436621c5
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (43).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (44).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (44).gif
new file mode 100644
index 000000000..a55173d34
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (44).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (45).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (45).gif
new file mode 100644
index 000000000..6007635fa
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (45).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (46).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (46).gif
new file mode 100644
index 000000000..63dfc39d1
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (46).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (47).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (47).gif
new file mode 100644
index 000000000..baafa4b82
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (47).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (48).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (48).gif
new file mode 100644
index 000000000..cba1296bd
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (48).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (49).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (49).gif
new file mode 100644
index 000000000..e109b79f6
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (49).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (5).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (5).gif
new file mode 100644
index 000000000..2a3803f12
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (5).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (50).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (50).gif
new file mode 100644
index 000000000..60f103357
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (50).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (51).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (51).gif
new file mode 100644
index 000000000..1ed661e6e
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (51).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (52).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (52).gif
new file mode 100644
index 000000000..0ffcffcb9
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (52).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (53).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (53).gif
new file mode 100644
index 000000000..d8bcea3fd
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (53).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (54).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (54).gif
new file mode 100644
index 000000000..14fffc481
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (54).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (55).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (55).gif
new file mode 100644
index 000000000..4f9d1da07
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (55).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (56).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (56).gif
new file mode 100644
index 000000000..54ac7dd8e
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (56).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (57).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (57).gif
new file mode 100644
index 000000000..c4a8b6dec
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (57).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (58).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (58).gif
new file mode 100644
index 000000000..a238ea606
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (58).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (59).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (59).gif
new file mode 100644
index 000000000..2588e9776
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (59).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (6).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (6).gif
new file mode 100644
index 000000000..ed97aa275
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (6).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (60).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (60).gif
new file mode 100644
index 000000000..c019e9433
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (60).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (61).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (61).gif
new file mode 100644
index 000000000..ebef9bc4d
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (61).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (62).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (62).gif
new file mode 100644
index 000000000..2006de47f
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (62).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (63).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (63).gif
new file mode 100644
index 000000000..72dae7872
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (63).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (64).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (64).gif
new file mode 100644
index 000000000..1c81da04f
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (64).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (65).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (65).gif
new file mode 100644
index 000000000..8c6907f02
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (65).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (66).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (66).gif
new file mode 100644
index 000000000..24b3b9d04
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (66).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (67).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (67).gif
new file mode 100644
index 000000000..60cb90426
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (67).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (68).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (68).gif
new file mode 100644
index 000000000..049b2c5bf
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (68).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (69).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (69).gif
new file mode 100644
index 000000000..c6b27c919
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (69).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (7).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (7).gif
new file mode 100644
index 000000000..d80e75e70
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (7).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (70).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (70).gif
new file mode 100644
index 000000000..d8404d080
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (70).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (71).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (71).gif
new file mode 100644
index 000000000..2a236da91
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (71).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (72).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (72).gif
new file mode 100644
index 000000000..8e76cdc88
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (72).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (73).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (73).gif
new file mode 100644
index 000000000..059df3f4e
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (73).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (74).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (74).gif
new file mode 100644
index 000000000..a7809fde0
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (74).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (75).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (75).gif
new file mode 100644
index 000000000..27a5f8dbd
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (75).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (76).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (76).gif
new file mode 100644
index 000000000..e01332b83
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (76).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (77).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (77).gif
new file mode 100644
index 000000000..fcfed01f4
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (77).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (78).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (78).gif
new file mode 100644
index 000000000..79647a54f
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (78).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (79).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (79).gif
new file mode 100644
index 000000000..1682dd35a
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (79).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (8).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (8).gif
new file mode 100644
index 000000000..518d3f015
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (8).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (80).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (80).gif
new file mode 100644
index 000000000..55a96fc50
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (80).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (81).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (81).gif
new file mode 100644
index 000000000..360d32bf6
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (81).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (82).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (82).gif
new file mode 100644
index 000000000..1a3a356af
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (82).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (83).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (83).gif
new file mode 100644
index 000000000..879ea718c
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (83).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (84).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (84).gif
new file mode 100644
index 000000000..9a2b7d106
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (84).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (85).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (85).gif
new file mode 100644
index 000000000..306b2d6fe
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (85).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (86).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (86).gif
new file mode 100644
index 000000000..f2ea3d3e0
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (86).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (87).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (87).gif
new file mode 100644
index 000000000..a8360b1db
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (87).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (88).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (88).gif
new file mode 100644
index 000000000..23bbead95
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (88).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (9).gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (9).gif
new file mode 100644
index 000000000..aa66e6440
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon (9).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon.gif b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon.gif
new file mode 100644
index 000000000..0521c0d72
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/animated/animate_emoticon.gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (1).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (1).gif
new file mode 100644
index 000000000..1a903627c
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (1).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (10).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (10).gif
new file mode 100644
index 000000000..e99047348
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (10).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (11).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (11).gif
new file mode 100644
index 000000000..bdc90241a
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (11).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (12).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (12).gif
new file mode 100644
index 000000000..735517a90
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (12).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (13).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (13).gif
new file mode 100644
index 000000000..d07bf34b2
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (13).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (14).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (14).gif
new file mode 100644
index 000000000..45670df93
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (14).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (15).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (15).gif
new file mode 100644
index 000000000..75e32d017
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (15).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (16).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (16).gif
new file mode 100644
index 000000000..9b4f0f5b9
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (16).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (17).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (17).gif
new file mode 100644
index 000000000..64033b3de
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (17).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (18).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (18).gif
new file mode 100644
index 000000000..c03bd640f
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (18).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (19).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (19).gif
new file mode 100644
index 000000000..e5f6c4ea7
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (19).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (2).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (2).gif
new file mode 100644
index 000000000..f55cd7766
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (2).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (20).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (20).gif
new file mode 100644
index 000000000..b815e3eb4
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (20).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (21).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (21).gif
new file mode 100644
index 000000000..48c5b1f38
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (21).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (22).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (22).gif
new file mode 100644
index 000000000..d524aaf75
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (22).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (23).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (23).gif
new file mode 100644
index 000000000..bdc90241a
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (23).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (24).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (24).gif
new file mode 100644
index 000000000..cbe38f48b
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (24).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (25).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (25).gif
new file mode 100644
index 000000000..72494585d
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (25).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (26).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (26).gif
new file mode 100644
index 000000000..ecd8876c0
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (26).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (27).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (27).gif
new file mode 100644
index 000000000..a84fea3c7
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (27).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (28).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (28).gif
new file mode 100644
index 000000000..829296db8
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (28).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (29).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (29).gif
new file mode 100644
index 000000000..16eb038a7
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (29).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (3).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (3).gif
new file mode 100644
index 000000000..3e3838034
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (3).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (30).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (30).gif
new file mode 100644
index 000000000..c717a19d6
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (30).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (31).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (31).gif
new file mode 100644
index 000000000..4f4be65e8
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (31).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (32).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (32).gif
new file mode 100644
index 000000000..3bfa3e52e
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (32).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (33).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (33).gif
new file mode 100644
index 000000000..390a908df
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (33).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (34).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (34).gif
new file mode 100644
index 000000000..aa866e371
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (34).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (35).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (35).gif
new file mode 100644
index 000000000..4cf833592
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (35).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (36).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (36).gif
new file mode 100644
index 000000000..e15b6dde0
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (36).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (37).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (37).gif
new file mode 100644
index 000000000..ef7951871
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (37).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (38).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (38).gif
new file mode 100644
index 000000000..7983fd207
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (38).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (4).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (4).gif
new file mode 100644
index 000000000..763789369
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (4).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (5).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (5).gif
new file mode 100644
index 000000000..8ff432db3
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (5).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (6).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (6).gif
new file mode 100644
index 000000000..3fe461798
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (6).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (7).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (7).gif
new file mode 100644
index 000000000..774d85345
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (7).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (8).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (8).gif
new file mode 100644
index 000000000..9bf924d21
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (8).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (9).gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (9).gif
new file mode 100644
index 000000000..90f15ea6e
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit (9).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/rabbit/rabbit.gif b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit.gif
new file mode 100644
index 000000000..d54adc77c
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/rabbit/rabbit.gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (1).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (1).gif
new file mode 100644
index 000000000..902484a4b
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (1).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (10).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (10).gif
new file mode 100644
index 000000000..73605ede7
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (10).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (11).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (11).gif
new file mode 100644
index 000000000..c89bed06a
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (11).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (12).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (12).gif
new file mode 100644
index 000000000..642a045b9
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (12).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (13).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (13).gif
new file mode 100644
index 000000000..4e248e7b6
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (13).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (14).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (14).gif
new file mode 100644
index 000000000..cea837f9d
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (14).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (15).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (15).gif
new file mode 100644
index 000000000..47187bd8e
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (15).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (16).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (16).gif
new file mode 100644
index 000000000..a2ea2a07b
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (16).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (17).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (17).gif
new file mode 100644
index 000000000..a5ce25f14
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (17).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (18).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (18).gif
new file mode 100644
index 000000000..c06637fa5
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (18).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (2).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (2).gif
new file mode 100644
index 000000000..df7f63020
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (2).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (3).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (3).gif
new file mode 100644
index 000000000..ebefa7fff
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (3).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (4).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (4).gif
new file mode 100644
index 000000000..46d45a255
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (4).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (5).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (5).gif
new file mode 100644
index 000000000..e360adf24
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (5).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (6).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (6).gif
new file mode 100644
index 000000000..87d74c10f
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (6).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (7).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (7).gif
new file mode 100644
index 000000000..7d9a30d56
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (7).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (8).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (8).gif
new file mode 100644
index 000000000..13b017049
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (8).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (9).gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (9).gif
new file mode 100644
index 000000000..26bfc7edc
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon (9).gif differ
diff --git a/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon.gif b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon.gif
new file mode 100644
index 000000000..ace9a69b6
Binary files /dev/null and b/modules/editor/components/emoticon/tpl/images/yellow/yellow_emoticon.gif differ
diff --git a/modules/editor/components/emoticon/tpl/popup.css b/modules/editor/components/emoticon/tpl/popup.css
index 35c87a1b0..778090d0d 100644
--- a/modules/editor/components/emoticon/tpl/popup.css
+++ b/modules/editor/components/emoticon/tpl/popup.css
@@ -2,8 +2,8 @@
 
 @import url(../../../../../modules/admin/tpl/css/admin.css);
 
-img.emoticon {
-    margin:10px;
-    cursor:pointer;
-}
+img.emoticon { margin:10px; cursor:pointer; }
+
+.emoticonList { position:absolute; top:20px; _top:17px; right:20px; }
+*:first-child+html .emoticonList { top:15px; }
 
diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html
index bd96a9f55..d1aadf18d 100644
--- a/modules/editor/components/emoticon/tpl/popup.html
+++ b/modules/editor/components/emoticon/tpl/popup.html
@@ -2,13 +2,22 @@
 <!--%import("popup.css")-->
 
 <div id="popHeadder">
-    <h1>{$component_info->title} ver. {$component_info->version}</h1>
+    <h3>
+        {$component_info->title} ver. {$component_info->version}
+    </h3>
+</div>
+
+<div class="emoticonList">
+    <select name="list" onchange="getEmoticons(this.options[this.selectedIndex].value); return false;">
+    <!--@foreach($emoticon_list as $key => $val)-->
+        <option value="{$val}">{$val}</option>
+    <!--@end-->
+    </select>
 </div>
 
 <div id="popBody">
-
-    <!--@foreach($emoticon_list as $emoticon)-->
-    <img src="images/{$emoticon}" alt="emoticon" onclick="insertEmoticon(this); return false;" class="emoticon" />
+    <!--@foreach($emoticons as $src)-->
+    <img src="images/{$src}" alt="{$src}" onclick="insertEmoticon(this); return false;" class="emoticon" />
     <!--@end-->
 
 </div>
diff --git a/modules/editor/components/emoticon/tpl/popup.js b/modules/editor/components/emoticon/tpl/popup.js
index 478b747ab..3e094735f 100644
--- a/modules/editor/components/emoticon/tpl/popup.js
+++ b/modules/editor/components/emoticon/tpl/popup.js
@@ -10,6 +10,27 @@ function insertEmoticon(obj) {
 
     opener.editorReplaceHTML(iframe_obj, text);
     opener.editorFocus(opener.editorPrevSrl);
-
-    window.close();
+}
+
+/* 선택된 이모티콘 목록을 가져옴 */
+function getEmoticons(emoticon) {
+  var params = new Array();
+  params['component'] = "emoticon";
+  params['emoticon'] = emoticon;
+  params['method'] = "getEmoticonList";
+
+  var response_tags = new Array('error','message','emoticons');
+  exec_xml('editor', 'procEditorCall', params, completeGetEmoticons, response_tags);
+}
+
+function completeGetEmoticons(ret_obj) {
+    var emoticons = ret_obj['emoticons'].split("\n");
+
+    var zone = xGetElementById("popBody");
+    var html = "";
+    for(var i=0;i<emoticons.length;i++) {
+        html += '<img src="./modules/editor/components/emoticon/tpl/images/'+emoticons[i]+'" onclick="insertEmoticon(this);return false;" class="emoticon" />';
+    }
+    xInnerHtml(zone, html);
+    setFixedPopupSize();
 }