diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 6ccc630b09..22a1937b2f 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -45,7 +45,7 @@
 .settings-list > .setting-box > .btn > h4 {padding-right: 5px;}
 .settings-list > .setting-box > .btn > h4  > div {gap: 3px;}
 .settings-list > .setting-box > .btn > h4 > img {padding-right: 8px; padding-bottom: 3px; width: 32px; height: 27px;}
-.settings-list > .setting-box > .btn > .setting-desc {padding-bottom: 16px; color: #5E626D; line-height: 25px; height: 50px; overflow: hidden;}
+.settings-list > .setting-box > .btn > .setting-desc {padding-bottom: 16px; line-height: 25px; height: 50px; overflow: hidden;}
 .settings-list.lite-setting > .setting-box {flex: 1 1 30%;}
 
 .plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;}
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index ad7bdc8f80..6af3c601a5 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -3,46 +3,46 @@ global $config;
 $lang->admin->menuList = new stdclass();
 $lang->admin->menuList->system['name']  = $lang->admin->menuSetting['system']['name'];
 $lang->admin->menuList->system['desc']  = $lang->admin->menuSetting['system']['desc'];
-$lang->admin->menuList->system['order'] = 1;
-
-$lang->admin->menuList->user['name']  = $lang->admin->menuSetting['user']['name'];
-$lang->admin->menuList->user['desc']  = $lang->admin->menuSetting['user']['desc'];
-$lang->admin->menuList->user['order'] = 2;
+$lang->admin->menuList->system['order'] = 5;
 
 $lang->admin->menuList->switch['name']  = $lang->admin->menuSetting['switch']['name'];
 $lang->admin->menuList->switch['desc']  = $lang->admin->menuSetting['switch']['desc'];
 $lang->admin->menuList->switch['link']  = 'admin|setmodule';
-$lang->admin->menuList->switch['order'] = 3;
+$lang->admin->menuList->switch['order'] = 10;
+
+$lang->admin->menuList->user['name']  = $lang->admin->menuSetting['user']['name'];
+$lang->admin->menuList->user['desc']  = $lang->admin->menuSetting['user']['desc'];
+$lang->admin->menuList->user['order'] = 15;
 
 $lang->admin->menuList->model['name']  = $lang->admin->menuSetting['model']['name'];
 $lang->admin->menuList->model['desc']  = $lang->admin->menuSetting['model']['desc'];
-$lang->admin->menuList->model['order'] = 4;
+$lang->admin->menuList->model['order'] = 20;
 
 $lang->admin->menuList->feature['name']  = $lang->admin->menuSetting['feature']['name'];
 $lang->admin->menuList->feature['desc']  = $lang->admin->menuSetting['feature']['desc'];
-$lang->admin->menuList->feature['order'] = 5;
+$lang->admin->menuList->feature['order'] = 25;
 
 $lang->admin->menuList->template['name']  = $lang->admin->menuSetting['template']['name'];
 $lang->admin->menuList->template['desc']  = $lang->admin->menuSetting['template']['desc'];
-$lang->admin->menuList->template['order'] = 6;
+$lang->admin->menuList->template['order'] = 30;
 
 $lang->admin->menuList->message['name']  = $lang->admin->menuSetting['message']['name'];
 $lang->admin->menuList->message['desc']  = $lang->admin->menuSetting['message']['desc'];
-$lang->admin->menuList->message['order'] = 7;
+$lang->admin->menuList->message['order'] = 35;
 
 $lang->admin->menuList->extension['name']  = $lang->admin->menuSetting['extension']['name'];
 $lang->admin->menuList->extension['desc']  = $lang->admin->menuSetting['extension']['desc'];
 $lang->admin->menuList->extension['link']  = 'extension|browse';
-$lang->admin->menuList->extension['order'] = 8;
+$lang->admin->menuList->extension['order'] = 40;
 
 $lang->admin->menuList->dev['name']  = $lang->admin->menuSetting['dev']['name'];
 $lang->admin->menuList->dev['desc']  = $lang->admin->menuSetting['dev']['desc'];
-$lang->admin->menuList->dev['order'] = 9;
+$lang->admin->menuList->dev['order'] = 45;
 
 $lang->admin->menuList->convert['name']  = $lang->admin->menuSetting['convert']['name'];
 $lang->admin->menuList->convert['desc']  = $lang->admin->menuSetting['convert']['desc'];
 $lang->admin->menuList->convert['link']  = 'convert|convertjira';
-$lang->admin->menuList->convert['order'] = 10;
+$lang->admin->menuList->convert['order'] = 50;
 
 $lang->admin->menuList->system['subMenu']['mode']        = array('link' => "{$lang->custom->mode}|custom|mode|");
 $lang->admin->menuList->system['subMenu']['backup']      = array('link' => "{$lang->backup->common}|backup|index|");
diff --git a/module/block/control.php b/module/block/control.php
index 78edb264b5..d2c0f8ff7f 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -978,14 +978,14 @@ class block extends control
 
         foreach($projects as $projectID => $project)
         {
-            if($project->model == 'scrum' or $project->model == 'kanban')
+            if(in_array($project->model, array('scrum', 'kanban', 'agileplus')))
             {
                 $this->app->loadClass('pager', $static = true);
                 $pager = pager::init(0, 3, 1);
                 $project->progress   = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100;
                 $project->executions = $this->execution->getStatData($projectID, 'all', 0, 0, false, '', 'id_desc', $pager);
             }
-            elseif($project->model == 'waterfall')
+            elseif(in_array($project->model, array('waterfall', 'waterfallplus')))
             {
                 $begin   = $project->begin;
                 $weeks   = $this->weekly->getWeekPairs($begin);
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
old mode 100644
new mode 100755
index e34409e652..cf797124b2
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -134,7 +134,7 @@ $(function()
       <?php foreach($projects as $project):?>
       <div class="tab-pane fade<?php if($project->id == $selected) echo ' active in';?>" id='<?php echo "tab3{$blockNavId}Content{$project->id}";?>'>
         <div class="table-row">
-          <?php if($project->model == 'scrum' or $project->model == 'kanban'):?>
+          <?php if(in_array($project->model, array('scrum', 'kanban', 'agileplus'))):?>
           <div class='table-row'>
             <div class="col-4 text-center">
               <div><h4><?php echo $lang->block->storyCount;?></h4></div>
diff --git a/module/build/js/view.js b/module/build/js/view.js
index 6ed6c1032d..b5fad596d4 100644
--- a/module/build/js/view.js
+++ b/module/build/js/view.js
@@ -69,3 +69,36 @@ $(function()
         }
     });
 })
+
+/**
+ * Delete item use ajax.
+ *
+ * @param  string url
+ * @param  string replaceID
+ * @param  string notice
+ * @access public
+ * @return void
+ */
+function ajaxDelete(url, replaceID, notice)
+{
+    if(confirm(notice))
+    {
+        $.ajax(
+        {
+            type:     'GET',
+            url:      url,
+            dataType: 'json',
+            success:  function(data)
+            {
+                if(data.result == 'success')
+                {
+                    location.reload();
+                }
+                else if(data.result == 'fail' && typeof(data.message) == 'string')
+                {
+                    bootbox.alert(data.message);
+                }
+            }
+        });
+    }
+}
diff --git a/module/company/control.php b/module/company/control.php
index 16500a0984..6a84f863e0 100755
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -224,7 +224,7 @@ class company extends control
         /* Get executions' list.*/
         $executions    = $this->loadModel('execution')->getPairs(0, 'all', 'nocode|multiple');
         $executionList = $this->execution->getByIdList(array_keys($executions));
-        foreach($executionList as $executionID => $execution)
+        foreach($executionList as $id => $execution)
         {
             if(isset($projects[$execution->project])) $executions[$execution->id] = $projects[$execution->project] . $executions[$execution->id];
         }
diff --git a/module/company/css/dynamic.en.css b/module/company/css/dynamic.en.css
new file mode 100644
index 0000000000..55276305b4
--- /dev/null
+++ b/module/company/css/dynamic.en.css
@@ -0,0 +1 @@
+.picker-drop-menu{max-width:300px !important;}
diff --git a/module/convert/view/importnotice.html.php b/module/convert/view/importnotice.html.php
index 7b27abe2cf..110a3d1679 100644
--- a/module/convert/view/importnotice.html.php
+++ b/module/convert/view/importnotice.html.php
@@ -41,8 +41,8 @@ li .form-control {margin-top: 10px}
       </ol>
     </div>
     <hr />
-    <div class='panel-footer text-center'>
-      <?php echo html::submitButton($lang->convert->jira->next);?>
+    <div class='panel-footer text-center form-actions'>
+      <?php echo html::submitButton($lang->convert->jira->next) . html::backButton();?>
     </div>
   </form>
 </div>
diff --git a/module/doc/js/selectlibtype.js b/module/doc/js/selectlibtype.js
index 8f807dfeb3..4ca7d52cb6 100644
--- a/module/doc/js/selectlibtype.js
+++ b/module/doc/js/selectlibtype.js
@@ -39,6 +39,7 @@ function loadDocLibs(type)
         $('#lib').replaceWith(data);
         $('#lib_chosen').remove();
         $('#lib').chosen();
+        $('#lib').siblings('div').css('width', 'calc(100% - 25px)');
 
         if($('#lib').find('option').length == 0)
         {
diff --git a/module/execution/control.php b/module/execution/control.php
index 9881cf4be7..9dcebbcacf 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2607,15 +2607,10 @@ class execution extends control
     public function kanban($executionID, $browseType = 'all', $orderBy = 'id_asc', $groupBy = 'default')
     {
         $this->app->loadLang('bug');
+        $this->app->loadLang('kanban');
 
         if(empty($groupBy)) $groupBy = 'default';
 
-        /* Set Session. */
-        $this->session->set('execLaneType', $browseType);
-        $this->session->set('execGroupBy', $groupBy);
-        $this->session->set('storyList', $this->app->getURI(true), 'execution');
-        $this->session->set('rdSearchValue', '');
-
         $this->lang->execution->menu = new stdclass();
         $execution = $this->commonAction($executionID);
         if($execution->type != 'kanban') return print(js::locate(inlink('view', "executionID=$executionID")));
@@ -2626,6 +2621,12 @@ class execution extends control
             unset($this->lang->kanban->group->task['story']);
         }
 
+        /* Set Session. */
+        $this->session->set('execGroupBy', $groupBy);
+        $this->session->set('storyList', $this->app->getURI(true), 'execution');
+        $this->session->set('rdSearchValue', '');
+        $this->session->set('execLaneType', $browseType);
+
         $kanbanData       = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy);
         $executionActions = array();
         foreach($this->config->execution->statusActions as $action)
diff --git a/module/execution/css/all.css b/module/execution/css/all.css
old mode 100644
new mode 100755
index b376d8fa05..81bb4a7bde
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -15,3 +15,5 @@
 .dtable-cell[data-sort='down'] .dtable-sort:after  {color: #000; opacity: 1}
 .dtable .toggle-icon {border-radius: 50%; border-style: solid;}
 .dtable-nested-toggle.is-no-child {display: block; opacity: 0; pointer-events: none;}
+
+.dtable-row.is-normal .dtable-cell[data-col="name"] {padding-left: 20px;}
diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js
index 05d613bebd..e650a2138f 100644
--- a/module/execution/js/edit.js
+++ b/module/execution/js/edit.js
@@ -123,7 +123,7 @@ $(function()
             hidePlanBox(attribute);
         })
 
-        $('#attribute').change();
+        hidePlanBox(executionAttr);
     }
 })
 var lastProjectID = $("#project").val();
diff --git a/module/execution/model.php b/module/execution/model.php
index 0c03e019a4..31307505c7 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -9,8 +9,6 @@
  * @version     $Id: model.php 5118 2013-07-12 07:41:41Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-?>
-<?php
 class executionModel extends model
 {
     /* The members every linking. */
@@ -1072,7 +1070,7 @@ class executionModel extends model
                     if($sibling->status != 'wait')
                     {
                         $siblingsAllWait = false;
-                        return $pointOutStages;
+                        break;
                     }
                 }
 
@@ -1092,7 +1090,7 @@ class executionModel extends model
                     if(!dao::isError())
                     {
                         $changes    = common::createChanges($parent, $newParent);
-                        $actionType = $parentStatus == 'doing' ? 'startbychildedit' : 'waitbychild';
+                        $actionType = $parentStatus == 'doing' ? 'started' : 'waitbychild';
                         $actionID   = $this->action->create('execution', $parentID, $actionType, '', $actionType);
                         $this->action->logHistory($actionID, $changes);
 
@@ -1121,7 +1119,7 @@ class executionModel extends model
         if(!dao::isError())
         {
             $changes  = common::createChanges($selfAndChildren[$executionID], $newExecution);
-            $actionID = $this->action->create('execution', $executionID, 'Edited');
+            $actionID = $this->action->create('execution', $executionID, 'Started');
             $this->action->logHistory($actionID, $changes);
 
             if($type != 'stage') return '';
@@ -1182,7 +1180,7 @@ class executionModel extends model
         if(!dao::isError())
         {
             $changes  = common::createChanges($selfAndChildren[$executionID], $newExecution);
-            $actionID = $this->action->create('execution', $executionID, 'Edited');
+            $actionID = $this->action->create('execution', $executionID, strtoupper($status));
             $this->action->logHistory($actionID, $changes);
 
             if($type != 'stage') return '';
diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index e4abda23d4..82685f94e9 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -206,22 +206,22 @@ $(function()
         }
     });
 
-    $('#swapper #dropMenu').on('onSearchComplete', function(event, value)
+    $('#swapper #dropMenu').on('onSearchComplete', function()
     {
-        if($('.list-group.executions').height() == 0)
-        {
-            $('#closed').attr("hidden", true);
-            $('#gray-line').attr("hidden", true);
-        }
-
         var listItem = $(this).find('.has-list');
-        listItem.each(function ()
+        listItem.each(function()
         {
             $(this).css('display','')
             var $hidden = $(this).find('.hidden');
             var $item   = $(this).find('.search-list-item');
             if($hidden.length == $item.length) $(this).css('display','none');
         });
+
+        if($('.list-group.executions').height() == 0)
+        {
+            $('#closed').attr("hidden", true);
+            $('#gray-line').attr("hidden", true);
+        }
     });
 })
 </script>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index b9c2a16446..5c89e3a012 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -15,6 +15,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <?php js::set('isStage', $execution->type == 'stage');?>
+<?php js::set('executionAttr', $execution->attribute);?>
 <?php js::set('manageProductsLang', $lang->project->manageProducts);?>
 <?php js::set('manageProductPlanLang', $lang->project->manageProductPlan);?>
 <div id='mainContent' class='main-content'>
@@ -161,7 +162,7 @@
         <?php $i = 0;?>
         <?php foreach($linkedProducts as $product):?>
         <tr class="<?php echo $hidden;?>">
-          <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
+          <th id='productTitle'><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
               <div class="col-sm-6 productBox">
@@ -252,7 +253,7 @@
         <?php $i = 0;?>
         <?php foreach($linkedProducts as $product):?>
         <tr>
-          <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
+          <th id="productTitle"><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
               <div class="col-sm-6 productBox">
@@ -261,7 +262,7 @@
                     <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
                     <div class='input-group <?php if($hasBranch) echo ' has-branch';?>'>
                       <span class='input-group-addon'><?php echo $lang->product->common;?></span>
-                      <?php $disabled = $execution->type == 'stage' ? "disabled='disabled'" : '';?>
+                      <?php $disabled = ($project->model == 'waterfall' or $project->model == 'waterfallplus') ? "disabled='disabled'" : '';?>
                       <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $disabled onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
                       <?php if($execution->type == 'stage' and !$project->division) echo html::hidden("products[$i]", $product->id);?>
                     </div>
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 1e1232132c..3273c180a6 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -345,7 +345,7 @@
               </div>
             </div>
             <?php endif;?>
-            <?php if($execution->projectInfo->hasProduct or $execution->projectInfo->model == 'scrum'):?>
+            <?php if(!(strpos($execution->projectInfo->model, 'waterfall') !== false and (empty($execution->projectInfo->hasProduct) or in_array($execution->attribute, array('request', 'review'))))):?>
             <div class="detail">
               <div class="detail-title"><strong><?php echo $lang->execution->linkPlan;?></strong></div>
               <div class="detail-content">
diff --git a/module/my/model.php b/module/my/model.php
index 89e57f22ea..4a65a3fe4a 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -571,10 +571,15 @@ class myModel extends model
         $query = preg_replace('/`(\w+)`/', 't1.`$1`', $query);
         $query = str_replace('t1.`project`', 't2.`project`', $query);
 
+        $assignedToMatches   = array();
+        $assignedToCondition = '';
+        $operatorAndAccount  = '';
         if(strpos($query, '`assignedTo`') !== false)
         {
-            preg_match("/`assignedTo`\s+(([^']*) ('([^']*)'))/", $query, $matches);
-            $query = str_replace("t1.$matches[0]", "(t1.$matches[0] or (t1.mode = 'multi' and t5.`account` $matches[1] and t1.status != 'closed' and t5.status != 'done') )", $query);
+            preg_match("/`assignedTo`\s+(([^']*) ('([^']*)'))/", $query, $assignedToMatches);
+            $assignedToCondition = $assignedToMatches[0];
+            $operatorAndAccount  = $assignedToMatches[1];
+            $query = str_replace("t1.$assignedToMatches[0]", "(t1.$assignedToCondition or (t1.mode = 'multi' and t5.`account` $operatorAndAccount and t1.status != 'closed' and t5.status != 'done') )", $query);
         }
 
         $orderBy = str_replace('pri_', 'priOrder_', $orderBy);
@@ -588,7 +593,10 @@ class myModel extends model
             ->andWhere('t1.deleted')->eq(0)
             ->andWhere('t2.deleted')->eq(0)
             ->andWhere('(t2.status')->ne('suspended')->orWhere('t4.status')->ne('suspended')->markRight(1)
-            ->beginIF($moduleName == 'workTask')->andWhere("(t1.$matches[0] or (t1.mode = 'multi' and t5.`account` $matches[1] and t1.status != 'closed' and t5.status != 'done') )")->fi()
+            ->beginIF($moduleName == 'workTask')
+            ->beginIF(!empty($assignedToMatches))->andWhere("(t1.$assignedToCondition or (t1.mode = 'multi' and t5.`account` $operatorAndAccount and t1.status != 'closed' and t5.status != 'done') )")->fi()
+            ->beginIF(empty($assignedToMatches))->andWhere("t1.assignedTo")->eq($account)->fi()
+            ->fi()
             ->beginIF($moduleName == 'contributeTask')
             ->andWhere('t1.openedBy', 1)->eq($account)
             ->orWhere('t1.closedBy')->eq($account)
diff --git a/module/stage/lang/zh-cn.php b/module/stage/lang/zh-cn.php
index 74db4344db..a0de0df795 100644
--- a/module/stage/lang/zh-cn.php
+++ b/module/stage/lang/zh-cn.php
@@ -19,7 +19,7 @@ $lang->stage->view        = '阶段详情';
 $lang->stage->plusBrowse  = '融合瀑布阶段列表';
 
 /* Fields. */
-$lang->stage->id      = '编号';
+$lang->stage->id      = 'ID';
 $lang->stage->name    = '阶段名称';
 $lang->stage->type    = '阶段类型';
 $lang->stage->percent = '工作量占比';
diff --git a/www/static/svg/admin-switch.svg b/www/static/svg/admin-switch.svg
index 88d99b7b0d..4689088c72 100644
--- a/www/static/svg/admin-switch.svg
+++ b/www/static/svg/admin-switch.svg
@@ -1,4 +1,4 @@
 <svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.538452" y="0.566406" width="22" height="22" rx="4" fill="#29AA93"/>
-<path d="M14.8041 8.12891H7.58533C5.59192 8.12891 3.97595 9.74488 3.97595 11.7383C3.97595 13.7317 5.59192 15.3477 7.58533 15.3477H14.8041C16.7975 15.3477 18.4135 13.7317 18.4135 11.7383C18.4135 9.74488 16.7975 8.12891 14.8041 8.12891ZM7.58533 14.5894C6.4135 14.6048 5.34848 13.9107 4.88935 12.8325C4.43021 11.7542 4.66794 10.5054 5.49112 9.67131C6.31431 8.83718 7.55984 8.58298 8.64406 9.02783C9.72827 9.47268 10.4363 10.5284 10.4364 11.7004C10.4366 13.2812 9.16606 14.5686 7.58533 14.5894Z" fill="white"/>
+<rect x="0.538574" y="0.566406" width="22" height="22" rx="4" fill="#A35FF9"/>
+<path d="M14.8042 8.12891H7.58545C5.59205 8.12891 3.97607 9.74488 3.97607 11.7383C3.97607 13.7317 5.59205 15.3477 7.58545 15.3477H14.8042C16.7976 15.3477 18.4136 13.7317 18.4136 11.7383C18.4136 9.74488 16.7976 8.12891 14.8042 8.12891ZM7.58545 14.5894C6.41362 14.6048 5.3486 13.9107 4.88947 12.8325C4.43033 11.7542 4.66806 10.5054 5.49124 9.67131C6.31443 8.83718 7.55997 8.58298 8.64418 9.02783C9.72839 9.47268 10.4365 10.5284 10.4366 11.7004C10.4367 13.2812 9.16618 14.5686 7.58545 14.5894Z" fill="white"/>
 </svg>
diff --git a/www/static/svg/admin-user.svg b/www/static/svg/admin-user.svg
index cb1ae851e4..7e57ae999c 100644
--- a/www/static/svg/admin-user.svg
+++ b/www/static/svg/admin-user.svg
@@ -1,4 +1,4 @@
 <svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.538452" y="0.566406" width="22" height="22" rx="4" fill="#A35FF9"/>
-<path d="M9.41553 8.50785C9.75409 8.50785 10.0893 8.57453 10.4021 8.7041C10.7149 8.83366 10.9991 9.02356 11.2385 9.26296C11.4779 9.50236 11.6678 9.78657 11.7974 10.0994C11.927 10.4122 11.9937 10.7474 11.9937 11.086V11.9453C11.9937 12.6291 11.722 13.2849 11.2385 13.7684C10.755 14.2518 10.0993 14.5235 9.41553 14.5235C8.73177 14.5235 8.07601 14.2518 7.59252 13.7684C7.10903 13.2849 6.8374 12.6291 6.8374 11.9453V11.086C6.8374 10.4022 7.10903 9.74645 7.59252 9.26296C8.07601 8.77947 8.73177 8.50785 9.41553 8.50785V8.50785ZM6.88295 14.27C7.20463 14.6212 7.59597 14.9016 8.03201 15.0932C8.46806 15.2848 8.93924 15.3834 9.41553 15.3828C9.89181 15.3834 10.363 15.2848 10.799 15.0932C11.2351 14.9016 11.6264 14.6212 11.9481 14.27C13.1295 14.8725 14.0591 15.8743 14.5718 17.0973V17.5313C14.5718 17.7592 14.4812 17.9778 14.3201 18.139C14.1589 18.3001 13.9403 18.3907 13.7124 18.3907H5.11865C4.89073 18.3907 4.67215 18.3001 4.51098 18.139C4.34982 17.9778 4.25928 17.7592 4.25928 17.5313V17.0977C4.7719 15.8745 5.7015 14.8726 6.88295 14.27ZM12.4844 13.4952C12.7144 13.0409 12.8401 12.5409 12.8522 12.0317C12.8814 12.0167 12.9106 12.0016 12.9403 11.9875C13.4976 12.5133 14.2352 12.8058 15.0015 12.8047C15.7677 12.8058 16.5053 12.5133 17.0627 11.9875C18.0494 12.4671 18.8394 13.2739 19.2983 14.2704V14.5235C19.2983 14.7514 19.2078 14.97 19.0466 15.1311C18.8855 15.2923 18.6669 15.3828 18.439 15.3828H14.6788C14.1048 14.5908 13.3533 13.9443 12.4844 13.4952V13.4952ZM15.0015 6.7891C15.5713 6.7891 16.1177 7.01545 16.5206 7.41836C16.9236 7.82127 17.1499 8.36773 17.1499 8.93754V9.79691C17.1498 10.3667 16.9235 10.9131 16.5206 11.316C16.1177 11.7188 15.5712 11.9451 15.0015 11.9451C14.4317 11.9451 13.8853 11.7188 13.4824 11.316C13.0795 10.9131 12.8531 10.3667 12.853 9.79691V8.93754C12.853 8.36773 13.0794 7.82127 13.4823 7.41836C13.8852 7.01545 14.4317 6.7891 15.0015 6.7891V6.7891ZM6.71279 7.29054C7.38654 6.88019 8.08822 6.57726 8.81912 6.38132C9.54959 6.18539 10.3093 6.09687 11.0973 6.11578C11.1901 6.11797 11.2796 6.15013 11.3526 6.20745C11.4255 6.26476 11.478 6.34415 11.5021 6.43375L11.5317 6.54418C11.5443 6.59153 11.5458 6.64116 11.536 6.68918C11.5263 6.73719 11.5055 6.78231 11.4755 6.82099C11.4454 6.85968 11.4068 6.89089 11.3627 6.91219C11.3185 6.93349 11.2701 6.9443 11.2211 6.94378C10.4856 6.9324 9.75212 7.02248 9.04127 7.21148C8.33129 7.40327 7.65114 7.69201 7.02002 8.06957C6.97786 8.09459 6.93049 8.10952 6.8816 8.11317C6.83271 8.11682 6.78364 8.10911 6.73823 8.09063C6.69282 8.07215 6.65231 8.04341 6.61987 8.00666C6.58743 7.9699 6.56393 7.92614 6.55123 7.87878L6.52158 7.76836C6.49765 7.6787 6.50338 7.5837 6.53792 7.49757C6.57247 7.41144 6.63397 7.33881 6.71322 7.29054H6.71279Z" fill="white"/>
+<rect x="0.538574" y="0.566406" width="22" height="22" rx="2" fill="#29AA93"/>
+<path d="M9.41553 8.50785C9.75409 8.50785 10.0893 8.57453 10.4021 8.70409C10.7149 8.83366 10.9991 9.02356 11.2385 9.26296C11.4779 9.50236 11.6678 9.78657 11.7974 10.0994C11.927 10.4122 11.9937 10.7474 11.9937 11.086V11.9453C11.9937 12.6291 11.722 13.2849 11.2385 13.7684C10.755 14.2518 10.0993 14.5235 9.41553 14.5235C8.73177 14.5235 8.07601 14.2518 7.59252 13.7684C7.10903 13.2849 6.8374 12.6291 6.8374 11.9453V11.086C6.8374 10.4022 7.10903 9.74645 7.59252 9.26296C8.07601 8.77947 8.73177 8.50785 9.41553 8.50785ZM6.88295 14.27C7.20463 14.6212 7.59597 14.9016 8.03201 15.0932C8.46806 15.2848 8.93924 15.3834 9.41553 15.3828C9.89181 15.3834 10.363 15.2848 10.799 15.0932C11.2351 14.9016 11.6264 14.6212 11.9481 14.27C13.1295 14.8725 14.0591 15.8743 14.5718 17.0973V17.5313C14.5718 17.7592 14.4812 17.9778 14.3201 18.139C14.1589 18.3001 13.9403 18.3907 13.7124 18.3907H5.11865C4.89073 18.3907 4.67215 18.3001 4.51098 18.139C4.34982 17.9778 4.25928 17.7592 4.25928 17.5313V17.0977C4.7719 15.8745 5.7015 14.8726 6.88295 14.27ZM12.4844 13.4952C12.7144 13.0409 12.8401 12.5409 12.8522 12.0317C12.8814 12.0167 12.9106 12.0016 12.9403 11.9875C13.4976 12.5133 14.2352 12.8058 15.0015 12.8047C15.7677 12.8058 16.5053 12.5133 17.0627 11.9875C18.0494 12.4671 18.8394 13.2739 19.2983 14.2704V14.5235C19.2983 14.7514 19.2078 14.97 19.0466 15.1311C18.8855 15.2923 18.6669 15.3828 18.439 15.3828H14.6788C14.1048 14.5908 13.3533 13.9443 12.4844 13.4952ZM15.0015 6.7891C15.5713 6.7891 16.1177 7.01545 16.5206 7.41836C16.9236 7.82127 17.1499 8.36773 17.1499 8.93753V9.79691C17.1498 10.3667 16.9235 10.9131 16.5206 11.316C16.1177 11.7188 15.5712 11.9451 15.0015 11.9451C14.4317 11.9451 13.8853 11.7188 13.4824 11.316C13.0795 10.9131 12.8531 10.3667 12.853 9.79691V8.93753C12.853 8.36773 13.0794 7.82127 13.4823 7.41836C13.8852 7.01545 14.4317 6.7891 15.0015 6.7891ZM6.71279 7.29054C7.38654 6.88019 8.08822 6.57726 8.81912 6.38132C9.54959 6.18539 10.3093 6.09687 11.0973 6.11578C11.1901 6.11797 11.2796 6.15013 11.3526 6.20745C11.4255 6.26476 11.478 6.34415 11.5021 6.43375L11.5317 6.54418C11.5443 6.59153 11.5458 6.64116 11.536 6.68918C11.5263 6.73719 11.5055 6.78231 11.4755 6.82099C11.4454 6.85968 11.4068 6.89089 11.3627 6.91219C11.3185 6.93349 11.2701 6.9443 11.2211 6.94378C10.4856 6.9324 9.75212 7.02248 9.04127 7.21148C8.33129 7.40327 7.65114 7.69201 7.02002 8.06957C6.97786 8.09459 6.93049 8.10952 6.8816 8.11317C6.83271 8.11682 6.78364 8.10911 6.73823 8.09063C6.69282 8.07215 6.65231 8.04341 6.61987 8.00666C6.58743 7.9699 6.56393 7.92614 6.55123 7.87878L6.52158 7.76836C6.49765 7.6787 6.50338 7.5837 6.53792 7.49757C6.57247 7.41144 6.63354 7.33881 6.71279 7.29054Z" fill="white"/>
 </svg>