diff --git a/src/main/webapp/assets/modular/system/app/app_add.js b/src/main/webapp/assets/modular/system/app/app_add.js
index 97741dd4d..d8b953140 100644
--- a/src/main/webapp/assets/modular/system/app/app_add.js
+++ b/src/main/webapp/assets/modular/system/app/app_add.js
@@ -1,10 +1,11 @@
 /**
  * 添加应用
  */
-layui.use(['form', 'admin', 'HttpRequest'], function () {
+layui.use(['form', 'admin', 'HttpRequest', 'iconPicker'], function () {
     var form = layui.form;
     var admin = layui.admin;
     var HttpRequest = layui.HttpRequest;
+    var iconPicker = layui.iconPicker;
 
     //表单提交事件
     form.on('submit(btnSubmit)', function (data) {
@@ -20,4 +21,15 @@ layui.use(['form', 'admin', 'HttpRequest'], function () {
         request.start(true);
     });
 
+    //初始化图标选择
+    iconPicker.render({
+        elem: '#appIcon',
+        type: 'fontClass',
+        search: true,
+        page: true,
+        limit: 12,
+        click: function (data) {
+        }
+    });
+
 });
diff --git a/src/main/webapp/assets/modular/system/app/app_edit.js b/src/main/webapp/assets/modular/system/app/app_edit.js
index b5d37093e..a6e50668e 100644
--- a/src/main/webapp/assets/modular/system/app/app_edit.js
+++ b/src/main/webapp/assets/modular/system/app/app_edit.js
@@ -1,10 +1,11 @@
 /**
  * 编辑应用
  */
-layui.use(['form', 'admin', 'HttpRequest'], function () {
+layui.use(['form', 'admin', 'HttpRequest', 'iconPicker'], function () {
     var form = layui.form;
     var admin = layui.admin;
     var HttpRequest = layui.HttpRequest;
+    var iconPicker = layui.iconPicker;
 
     // 获取应用详情
     var request = new HttpRequest(Feng.ctxPath + "/sysApp/detail?appId=" + Feng.getUrlParam("appId"), 'get');
@@ -26,4 +27,17 @@ layui.use(['form', 'admin', 'HttpRequest'], function () {
         request.start(true);
     });
 
+    //初始化图标选择
+    iconPicker.render({
+        elem: '#appIcon',
+        type: 'fontClass',
+        search: true,
+        page: true,
+        limit: 12,
+        click: function (data) {
+        }
+    });
+
+    iconPicker.checkIcon('iconPicker', result.data.appIcon);
+
 });
diff --git a/src/main/webapp/pages/modular/system/app/app_add.html b/src/main/webapp/pages/modular/system/app/app_add.html
index 4815084f3..4b622b1b5 100644
--- a/src/main/webapp/pages/modular/system/app/app_add.html
+++ b/src/main/webapp/pages/modular/system/app/app_add.html
@@ -18,6 +18,12 @@
                             <input name="appCode" placeholder="请输入应用编码" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
                         </div>
                     </div>
+                    <div class="layui-inline layui-col-md12">
+                        <label class="layui-form-label layui-form-required">应用图标</label>
+                        <div class="layui-input-block">
+                            <input name="appIcon" id="appIcon" placeholder="请输入应用图标" lay-filter="iconPicker" type="text" class="layui-input" lay-verify="required" required/>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/main/webapp/pages/modular/system/app/app_edit.html b/src/main/webapp/pages/modular/system/app/app_edit.html
index e974057e8..e5add78ce 100644
--- a/src/main/webapp/pages/modular/system/app/app_edit.html
+++ b/src/main/webapp/pages/modular/system/app/app_edit.html
@@ -18,6 +18,12 @@
                             <input name="appCode" placeholder="请输入应用编码" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
                         </div>
                     </div>
+                    <div class="layui-inline layui-col-md12">
+                        <label class="layui-form-label layui-form-required">应用图标</label>
+                        <div class="layui-input-block">
+                            <input name="appIcon" id="appIcon" placeholder="请输入应用图标" lay-filter="iconPicker" type="text" class="layui-input" lay-verify="required" required/>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>