diff --git a/module/my/css/todo.css b/module/my/css/todo.css
index 4391484b57..5ff682bd50 100644
--- a/module/my/css/todo.css
+++ b/module/my/css/todo.css
@@ -4,3 +4,7 @@
 .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
 .btn-toolbar .space {min-height: 1px; margin: 0 -3px 0 10px;}
 .iconCenter {top: -2px !important;}
+
+#switchButton {background: #fff !important;}
+.panel-actions {position: relative; padding: 0;}
+.panel-actions .btn-icon {padding-left: 7px;}
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 6db91d204f..b40d3042f8 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -35,6 +35,12 @@
     </div>
   </div>
   <div class="btn-toolbar pull-right">
+    <?php if($config->edition != 'open' and !empty($app->user) and common::hasPriv('todo', 'calendar')):?>
+    <div class="btn-group panel-actions">
+      <?php echo html::a(helper::createLink('todo', 'calendar'), "<i class='icon-cards-view'></i> &nbsp;", '', "class='btn btn-icon' title='{$lang->todo->calendar}' id='switchButton'");?>
+      <?php echo html::a(helper::createLink('my', 'todo', "type=all"), "<i class='icon-list'></i> &nbsp;", '', "class='btn btn-icon text-primary' title='{$lang->todo->list}' id='switchButton'");?>
+    </div>
+    <?php endif;?>
     <?php if(common::hasPriv('todo', 'export')) echo html::a(helper::createLink('todo', 'export', "userID={$user->id}&orderBy=$orderBy", 'html', true), "<i class='icon-export muted'> </i> " . $lang->todo->export, '', "class='btn btn-link export' data-width='600px'");?>
     <?php if(common::hasPriv('todo', 'create') or common::hasPriv('todo', 'batchCreate')):?>
     <div class='btn-group dropdown'>
diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index 6861525adc..411929ed5a 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -334,6 +334,9 @@ $config->delete['17_0_beta1'][] = 'extension/max/group/ext/model/flow.php';
 $config->delete['17_0_beta1'][] = 'extension/max/user/ext/model/bizext.php';
 $config->delete['17_0_beta1'][] = 'extension/max/sso/ext/model/bizext.php';
 
+$config->delete['17_2'][] = 'extension/biz/my/ext/view/todo.calendar.html.hook.php';
+$config->delete['17_2'][] = 'extension/max/my/ext/view/todo.calendar.html.hook.php';
+
 $config->upgrade->openModules = array('action', 'admin', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'caselib', 'ci', 'client', 'common', 'company', 'compile', 'convert', 'cron', 'custom', 'datatable', 'dept', 'design', 'dev', 'doc', 'durationestimation', 'entry', 'execution', 'extension', 'file', 'git', 'gitlab', 'group', 'holiday', 'im', 'index', 'index.html', 'install', 'issue', 'jenkins', 'job', 'kanban', 'license', 'mail', 'message', 'misc', 'mr', 'my', 'personnel', 'pipeline', 'product', 'productplan', 'productset', 'program', 'programplan', 'project', 'projectbuild', 'projectrelease', 'projectstory', 'qa', 'release', 'repo', 'report', 'risk', 'score', 'search', 'setting', 'sonarqube', 'sso', 'stage', 'stakeholder', 'story', 'subject', 'svn', 'task', 'testcase', 'testreport', 'testsuite', 'testtask', 'todo', 'tree', 'tutorial', 'upgrade', 'user', 'webhook', 'weekly', 'workestimation');
 
 $config->upgrade->unsetModules = array('design', 'program', 'programplan', 'projectbuild', 'projectrelease', 'stage', 'stakeholder', 'product', 'branch', 'productplan', 'release', 'build', 'qa', 'bug', 'testcase', 'testtask', 'testreport', 'testsuite', 'caselib', 'automation', 'repo', 'ci', 'compile', 'jenkins', 'job', 'svn', 'gitlab', 'sonarqube', 'mr', 'git', 'report', 'sqlbuilder', 'feedback', 'faq', 'attend', 'holiday', 'leave', 'makeup', 'overtime', 'lieu', 'ops', 'host', 'serverroom', 'account', 'domain', 'service', 'deploy', 'conference', 'traincourse', 'pssp', 'baseline', 'classify', 'cm', 'cmcl', 'auditcl', 'reviewcl', 'process', 'activity', 'zoutput', 'auditplan', 'nc', 'subject', 'weekly', 'workestimation', 'issue', 'durationestimation', 'risk', 'opportunity', 'trainplan', 'gapanalysis', 'researchplan', 'researchreport', 'meeting', 'meetingroom', 'budget', 'reviewissue', 'reviewsetting', 'review', 'milestone', 'measurement', 'measrecord', 'assetlib', 'setting', 'im', 'client', 'ldap', 'dev', 'api');