diff --git a/src/ajax.js b/src/ajax.js
index 12677e2..269e6d1 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -891,7 +891,9 @@ function loadLists(onInit, updAccess)
 			$.each(json.list, function(i,item){
 				item.i = i;
 				tabLists[i] = item;
-				ti += '<li id="list_'+item.id+'" class="'+(i==0?'mtt-tabs-selected':'')+'"><a href="#list'+item.id+'" onClick="mttTabSelected('+item.id+','+i+');return false;" title="'+item.name+'"><span>'+item.name+'</span></a></li>';
+				ti += '<li id="list_'+item.id+'" class="'+(i==0?'mtt-tabs-selected':'')+'">'+
+					'<a href="#list'+item.id+'" title="'+item.name+'" onClick="mttTabSelected('+item.id+','+i+');return false;"><span>'+item.name+'</span>'+
+					'<div class="list-action" onClick="listMenu(this,'+i+');return stopBubble(arguments[0]);"></div></a></li>';
 			});
 			if(!curList) {
 				$('#toolbar').children().removeClass('invisible');
@@ -911,8 +913,7 @@ function loadLists(onInit, updAccess)
 			$('#mylistscontainer .mtt-need-list').addClass('mtt-disabled');
 			$('#tasklist').html('');
 		}
-		ti += '<li class="mtt-tabs-button menu-owner"><a href="#" onClick="listMenu(this);return false;"><span></span></a></li>';
-		$('#lists>ul').html(ti);
+		$('#lists ul').html(ti);
 		$('#lists').show();
 		mytinytodo.doAction('listsLoaded');
 		if(curList) mytinytodo.doAction('listSelected', curList);
@@ -934,7 +935,9 @@ function addList()
 		item.i = i;
 		tabLists[i] = item;
 		if(i > 0) {
-			$('#lists>ul>li.mtt-tabs-button').before('<li id="list_'+item.id+'"><a href="#list'+item.id+'" onClick="mttTabSelected('+item.id+','+i+');return false;" title="'+item.name+'"><span>'+item.name+'</span></a></li>') ;
+			$('#lists ul').append('<li id="list_'+item.id+'">'+
+					'<a href="#list'+item.id+'" title="'+item.name+'" onClick="mttTabSelected('+item.id+','+i+');return false;"><span>'+item.name+'</span>'+
+					'<div class="list-action" onClick="listMenu(this,'+i+');return stopBubble(arguments[0]);"></div></a></li>');
 			mytinytodo.doAction('listAdded', item);
 		}
 		else loadLists();
@@ -953,7 +956,7 @@ function renameCurList()
 		item.i = curList.i;
 		tabLists[curList.i] = item;
 		curList = item;
-		$('#lists>ul>.mtt-tabs-selected>a').attr('title', item.name).find('span').html(item.name);
+		$('#lists ul>.mtt-tabs-selected>a').attr('title', item.name).find('span').html(item.name);
 		mytinytodo.doAction('listRenamed', item);
 	}, 'json');
 }
@@ -1345,3 +1348,11 @@ function listMenuClick(el, menu)
 		case 'sortByDueDate': setSort(2); break;
 	}
 }
+
+function stopBubble(e)
+{
+	if(!e) e = window.event;
+	e.cancelBubble = true;
+	if(e.stopPropagation) e.stopPropagation();
+	return false;
+}
diff --git a/src/themes/default/index.php b/src/themes/default/index.php
index a8cd259..d48bc18 100644
--- a/src/themes/default/index.php
+++ b/src/themes/default/index.php
@@ -67,7 +67,7 @@ $().ready(function(){
 	mytinytodo.addAction('listAdded', tplSingleTabAdded);
 <?php endif; ?>
 <?php if(!isset($_GET['singletab']) && !isset($_GET['pda'])): ?>
-	$("#lists ul").sortable({delay:150, update:listOrderChanged, items:'> :not(.mtt-tabs-button)'});
+	$("#lists ul").sortable({delay:150, update:listOrderChanged});
 <?php endif; ?>
 });
 </script>
@@ -101,6 +101,7 @@ $().ready(function(){
 
 <div id="lists">
  <ul class="mtt-tabs <?php if(isset($_GET['singletab'])) echo "mtt-tabs-only-one"; ?>"></ul>
+ <div class="mtt-tabs-add-button" onClick="addList();return false;" title="<?php _e('list_new'); ?>"><span>+</span></div>
 </div>
 
 <div id="toolbar" class="mtt-htabs">
@@ -192,7 +193,6 @@ $().ready(function(){
 
 <div id="mylistscontainer" class="mtt-btnmenu-container mtt-menu-has-images" style="display:none">
 <ul>
- <li id="btnAddList"><?php _e('list_new');?></li>
  <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="btnPublish"><div class="menu-icon"></div><?php _e('list_publish');?></li>
diff --git a/src/themes/default/style.css b/src/themes/default/style.css
index 8a82a18..554b880 100644
--- a/src/themes/default/style.css
+++ b/src/themes/default/style.css
@@ -26,17 +26,24 @@ a { color:#0000ff; }
 
 .mtt-tabs { list-style:none; padding:0; margin:0; }
 .mtt-tabs li { margin:1px 3px 0 0; float:left; max-width:199px; border-left:1px solid #ededed; background:#fbfbfb url(images/tab_hover.gif) no-repeat top right; }
-.mtt-tabs a { margin:0; font-size:9pt; font-weight:bold; text-decoration:none; text-align:center; white-space:nowrap; color:#444444; display:block; height:21px; padding:6px 6px 0px 2px; outline:none; vertical-align:top; }
-.mtt-tabs a span { display:block;  min-width:75px; cursor:pointer; padding:0; overflow:hidden; }
+.mtt-tabs a { position:relative; margin:0; font-size:9pt; font-weight:bold; text-decoration:none; text-align:center; white-space:nowrap; color:#444444; display:block; height:21px; padding:6px 6px 0px 2px; outline:none; vertical-align:top; }
+.mtt-tabs a span { display:block; min-width:75px; cursor:pointer; padding:0; overflow:hidden; }
+.mtt-tabs .list-action { display:none; float:left; position:absolute; top:6px; right:5px; width:15px; height:15px; background:#fff url(images/icons.gif) 0 0 no-repeat; }
+.mtt-tabs .list-action:hover { background-position:-16px 0; cursor:pointer; }
+.mtt-tabs li.mtt-tabs-selected span { margin-right:16px; }
+.mtt-tabs li.mtt-tabs-selected .list-action { display:block; }
 .mtt-tabs li.mtt-tabs-selected { background:#ededed url(images/corner_right.gif) no-repeat top right; border-left:1px solid #ededed; }
 .mtt-tabs li:hover a { color: #888888; }
-.mtt-tabs li.mtt-tabs-button { width:21px; min-width:21px; }
-.mtt-tabs li.mtt-tabs-button a { padding:6px 0px 0px 0px; }
-.mtt-tabs li.mtt-tabs-button a span { width:21px; min-width:21px; display:block; background:url(images/arrdown.gif) no-repeat center 4px; height:12px; }
-.mtt-tabs li.mtt-tabs-button:hover a span { opacity:0.5; }
 .mtt-tabs.mtt-tabs-only-one li { display:none; }
-.mtt-tabs.mtt-tabs-only-one li.mtt-tabs-selected, .mtt-tabs.mtt-tabs-only-one li.mtt-tabs-button { display:block; }
-#page_tasks.readonly li.mtt-tabs-button { display:none; }
+.mtt-tabs.mtt-tabs-only-one li.mtt-tabs-selected { display:block; }
+#page_tasks.readonly .list-action { display:none; }
+#page_tasks.readonly li.mtt-tabs-selected span { margin-right:0; }
+
+.mtt-tabs-add-button { float:left; margin-top:1px; padding:6px 2px 0px 2px; font-size:9pt; width:16px; border-left:1px solid #ededed; background:#fbfbfb url(images/tab_hover.gif) no-repeat top right; }
+.mtt-tabs-add-button:hover { cursor:pointer; }
+.mtt-tabs-add-button span { display:block; height:21px; text-align:center; font-weight:bold; color:#444444; }
+.mtt-tabs-add-button:hover span {color: #888888; }
+#page_tasks.readonly .mtt-tabs-add-button { display:none; }
 
 #page_tasks.readonly #htab_search a.htab-toggle { color:#444; }
 .mtt-htabs  { clear:both; padding:8px; border-bottom:2px solid #DEDEDE; background:url(images/corner_right.gif) no-repeat top right #ededed; }