diff --git a/src/themes/default/index.php b/src/themes/default/index.php
index a156766..de44468 100644
--- a/src/themes/default/index.php
+++ b/src/themes/default/index.php
@@ -184,7 +184,7 @@ $().ready(function(){
  <span class="prio-pos prio-pos-2">+2</span>
 </div>
 
-<div id="taskviewcontainer" class="mtt-btnmenu-container" style="display:none">
+<div id="taskviewcontainer" class="mtt-menu-container" style="display:none">
 <ul>
  <li id="view_tasks"><?php _e('tasks');?> (<span id="cnt_total">0</span>)</li>
  <li id="view_past"><?php _e('f_past');?> (<span id="cnt_past">0</span>)</li>
@@ -200,23 +200,23 @@ $().ready(function(){
 </div>
 
 
-<div id="mylistscontainer" class="mtt-btnmenu-container mtt-menu-has-images" style="display:none">
+<div id="mylistscontainer" class="mtt-menu-container" style="display:none">
 <ul>
  <li class="mtt-need-list" id="btnRenameList"><?php _e('list_rename');?></li>
  <li class="mtt-need-list" id="btnDeleteList"><?php _e('list_delete');?></li>
  <li class="mtt-need-list" id="btnClearCompleted"><?php _e('list_clearcompleted');?></li>
  <li class="mtt-need-list" id="btnExportCSV"><?php _e('list_exportcsv');?></li>
- <li class="mtt-btnmenu-delimiter"></li>
+ <li class="mtt-menu-delimiter"></li>
  <li class="mtt-need-list" id="btnPublish"><div class="menu-icon"></div><?php _e('list_publish');?></li>
  <li class="mtt-need-list" id="btnShowCompleted"><div class="menu-icon"></div><?php _e('list_showcompleted');?></li>
- <li class="mtt-btnmenu-delimiter"></li>
+ <li class="mtt-menu-delimiter"></li>
  <li class="mtt-need-list sort-item" id="sortByHand"><div class="menu-icon"></div><?php _e('sortByHand');?></li>
  <li class="mtt-need-list sort-item" id="sortByPrio"><div class="menu-icon"></div><?php _e('sortByPriority');?></li>
  <li class="mtt-need-list sort-item" id="sortByDueDate"><div class="menu-icon"></div><?php _e('sortByDueDate');?></li>
 </ul>
 </div>
 
-<div id="taskcontextcontainer" class="mtt-btnmenu-container mtt-menu-has-images mtt-menu-has-submenu" style="display:none">
+<div id="taskcontextcontainer" class="mtt-menu-container" style="display:none">
 <ul>
  <li id="cmenu_edit"><b><?php _e('action_edit');?></b></li>
  <li id="cmenu_note"><?php _e('action_note');?></li>
@@ -226,7 +226,7 @@ $().ready(function(){
 </ul>
 </div>
 
-<div id="priocontainer" class="mtt-btnmenu-container mtt-menu-has-images" style="display:none">
+<div id="priocontainer" class="mtt-menu-container" style="display:none">
 <ul>
  <li id="cmenu_prio:2">+2</li>
  <li id="cmenu_prio:1">+1</li>
@@ -235,12 +235,12 @@ $().ready(function(){
 </ul>
 </div>
 
-<div id="listsmenucontainer" class="mtt-btnmenu-container mtt-menu-has-images" style="display:none">
+<div id="listsmenucontainer" class="mtt-menu-container" style="display:none">
 <ul>
 </ul>
 </div>
 
-<div id="slmenucontainer" class="mtt-btnmenu-container mtt-menu-has-images" style="display:none">
+<div id="slmenucontainer" class="mtt-menu-container" style="display:none">
 <ul>
 </ul>
 </div>
diff --git a/src/themes/default/style.css b/src/themes/default/style.css
index 41d407e..7fb3827 100644
--- a/src/themes/default/style.css
+++ b/src/themes/default/style.css
@@ -289,21 +289,21 @@ li.task-completed .task-note-block .task-note { text-decoration:line-through; }
  border:1px solid #ccc; -moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px;
 }
 
-.mtt-btnmenu-container { 
+.mtt-menu-container { 
 	overflow:hidden; z-index:100;
 	background-color:#f9f9f9; border:1px solid #cccccc; padding:2px;
-	-moz-box-shadow:1px 2px 5px rgba(0,0,0,0.5); -webkit-box-shadow:1px 2px 5px rgba(0,0,0,0.5); margin:0px 7px 7px 0px;
+	-moz-box-shadow:1px 2px 5px rgba(0,0,0,0.5); -webkit-box-shadow:1px 2px 5px rgba(0,0,0,0.5); box-shadow:1px 2px 5px rgba(0,0,0,0.5); 
+	-moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;
+	margin:0px 7px 7px 0px; /* for shadows */
 } 
-.mtt-btnmenu-container ul { list-style: none; padding:0; margin:0; }
-.mtt-btnmenu-container li { margin:1px 0px; padding:2px 3px; cursor:pointer; color:#000; white-space:nowrap; }
-.mtt-btnmenu-container li:hover, .mtt-btnmenu-container li.mtt-menu-item-active { background-color:#316AC5; color:white; }
-.mtt-btnmenu-container li.mtt-disabled { color:#ACA899; }
-.mtt-btnmenu-container a { display:block; text-decoration:none; outline:none; color:#000; }
-.mtt-btnmenu-container li:hover a { color:white; }
-.mtt-btnmenu-container.mtt-menu-has-images li { padding-left:18px; }
-.mtt-btnmenu-container li.mtt-btnmenu-delimiter { height:0px; line-height:0; border-bottom:1px solid #cccccc; margin:2px -1px; padding:0px; font-size:0px; }
+.mtt-menu-container ul { list-style: none; padding:0; margin:0; }
+.mtt-menu-container li { margin:1px 0px; padding:2px 3px; cursor:default; color:#000; white-space:nowrap; padding-left:18px; padding-right:18px; }
+.mtt-menu-container li:hover, .mtt-menu-container li.mtt-menu-item-active { background-color:#316AC5; color:white; }
+.mtt-menu-container li.mtt-disabled { color:#ACA899; }
+.mtt-menu-container a { display:block; text-decoration:none; outline:none; color:#000; }
+.mtt-menu-container li:hover a { color:white; }
+.mtt-menu-container li.mtt-menu-delimiter { height:0px; line-height:0; border-bottom:1px solid #cccccc; margin:2px -1px; padding:0px; font-size:0px; }
 li.mtt-item-checked .menu-icon { float:left; width:16px; height:16px; margin-left:-18px; background:url(images/icons.gif) -16px -16px; }
-.mtt-btnmenu-container.mtt-menu-has-submenu li { padding-right:18px; }
 li.mtt-menu-indicator .submenu-icon {
 	/*float:right; margin-right:-18px;*/ position:absolute; right:2px; /* specially for IE7 */
 	width:16px; height:16px; background:url(images/icons.gif) -32px -16px no-repeat;