diff --git a/src/ajax.js b/src/ajax.js
index 4357f72..025ecb2 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1162,7 +1162,7 @@ function mttMenu(container, options)
 	this.submenu = [];
 
 	//create submenus
-	this.container.find('li.mtt-menu-has-submenu').each(function()
+	this.container.find('li.mtt-menu-indicator').each(function()
 	{
 		var submenu = new mttMenu($(this).attr('submenu'));
 		submenu.$caller = $(this);
@@ -1212,7 +1212,7 @@ function mttMenu(container, options)
 
 	this.onclick = function(item)
 	{
-		if($(item).is('.mtt-disabled,.mtt-menu-has-submenu')) return;
+		if($(item).is('.mtt-disabled,.mtt-menu-indicator')) return;
 		menu.close();
 		if(this.options.onclick) this.options.onclick(item);
 	}
diff --git a/src/images/arrbtn.gif b/src/images/arrbtn.gif
deleted file mode 100644
index a36dc68..0000000
Binary files a/src/images/arrbtn.gif and /dev/null differ
diff --git a/src/images/arrbtn_bw.gif b/src/images/arrbtn_bw.gif
deleted file mode 100644
index 10f9593..0000000
Binary files a/src/images/arrbtn_bw.gif and /dev/null differ
diff --git a/src/images/arrright.gif b/src/images/arrright.gif
deleted file mode 100644
index 675d271..0000000
Binary files a/src/images/arrright.gif and /dev/null differ
diff --git a/src/images/checkmark.gif b/src/images/checkmark.gif
deleted file mode 100644
index b070e51..0000000
Binary files a/src/images/checkmark.gif and /dev/null differ
diff --git a/src/images/icons.gif b/src/images/icons.gif
new file mode 100644
index 0000000..32b49f8
Binary files /dev/null and b/src/images/icons.gif differ
diff --git a/src/images/resizegrip.gif b/src/images/resizegrip.gif
deleted file mode 100644
index 51695c2..0000000
Binary files a/src/images/resizegrip.gif and /dev/null differ
diff --git a/src/images/toggle_minus.gif b/src/images/toggle_minus.gif
deleted file mode 100644
index 19d433b..0000000
Binary files a/src/images/toggle_minus.gif and /dev/null differ
diff --git a/src/images/toggle_plus.gif b/src/images/toggle_plus.gif
deleted file mode 100644
index 14a7ab2..0000000
Binary files a/src/images/toggle_plus.gif and /dev/null differ
diff --git a/src/index.php b/src/index.php
index 592381f..d3651f8 100644
--- a/src/index.php
+++ b/src/index.php
@@ -204,26 +204,26 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
  <div id="tagcloudcontent"></div>
 </div>
 
-<div id="mylistscontainer" class="mtt-btnmenu-container mtt-btnmenu-hasimages" style="display:none">
+<div id="mylistscontainer" class="mtt-btnmenu-container mtt-menu-has-images" style="display:none">
 <ul>
  <li onClick="addList()"><?php _e('list_new');?></li>
  <li class="mtt-need-list" onClick="renameCurList()"><?php _e('list_rename');?></li>
  <li class="mtt-need-list" onClick="deleteCurList()"><?php _e('list_delete');?></li>
- <li class="mtt-need-list" id="btnPublish" onClick="publishCurList()"><?php _e('list_publish');?></li>
+ <li class="mtt-need-list" id="btnPublish" onClick="publishCurList()"><div class="menu-icon"></div><?php _e('list_publish');?></li>
 </ul>
 </div>
 
-<div id="taskcontextcontainer" class="mtt-btnmenu-container mtt-btnmenu-hasimages" style="display:none">
+<div id="taskcontextcontainer" class="mtt-btnmenu-container mtt-menu-has-images mtt-menu-has-submenu" style="display:none">
 <ul>
  <li id="cmenu_edit"><b><?php _e('action_edit');?></b></li>
  <li id="cmenu_note"><?php _e('action_note');?></li>
- <li id="cmenu_prio" class="mtt-menu-has-submenu" submenu="priocontainer"><?php _e('action_priority');?></li>
- <li id="cmenu_move" class="mtt-menu-has-submenu" submenu="listsmenucontainer"><?php _e('action_move');?></li>
+ <li id="cmenu_prio" class="mtt-menu-indicator" submenu="priocontainer"><div class="submenu-icon"></div><?php _e('action_priority');?></li>
+ <li id="cmenu_move" class="mtt-menu-indicator" submenu="listsmenucontainer"><div class="submenu-icon"></div><?php _e('action_move');?></li>
  <li id="cmenu_delete"><?php _e('action_delete');?></li>
 </ul>
 </div>
 
-<div id="priocontainer" class="mtt-btnmenu-container mtt-btnmenu-hasimages" style="display:none">
+<div id="priocontainer" class="mtt-btnmenu-container mtt-menu-has-images" style="display:none">
 <ul>
  <li id="cmenu_prio:-1">&minus;1</li>
  <li id="cmenu_prio:0">&plusmn;0</li>
@@ -232,7 +232,7 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 </ul>
 </div>
 
-<div id="listsmenucontainer" class="mtt-btnmenu-container mtt-btnmenu-hasimages" style="display:none">
+<div id="listsmenucontainer" class="mtt-btnmenu-container mtt-menu-has-images" style="display:none">
 <ul>
 </ul>
 </div>
diff --git a/src/style.css b/src/style.css
index d401654..2290b6b 100644
--- a/src/style.css
+++ b/src/style.css
@@ -60,8 +60,8 @@ a { color:#0000ff; }
 #rss_icon { float:right;margin-top:4px; }
 
 .task-left { float:left; }
-.task-left .mtt-toggle { margin-top:2px; cursor:pointer; width:15px; height:15px; float:left; background:url(images/toggle_plus.gif) left top no-repeat; }
-.task-left .mtt-toggle.mtt-toggle-expanded { background-image:url(images/toggle_minus.gif); }
+.task-left .mtt-toggle { margin-top:2px; cursor:pointer; width:15px; height:15px; float:left; background:url(images/icons.gif) -32px 0 no-repeat; }
+.task-left .mtt-toggle.mtt-toggle-expanded { background-position:-48px 0; }
 .task-middle { margin-left:40px; margin-right:25px; }
 #tasklist { list-style-type: none; margin: 0; padding: 0;}
 #tasklist li { padding:6px 2px 6px 6px; border-bottom:1px solid #DEDEDE; min-height:18px; margin-bottom:1px; background-color:#fff; }
@@ -87,8 +87,8 @@ li.task-completed .task-actions a { color:#7070ff; }
 li.task-completed  { opacity:0.8; }
 li.task-completed .mtt-toggle { opacity:0.8; }
 
-a.taskactionbtn { display:block; float:right; height:16px; width:16px; text-decoration:none; background:url(images/arrbtn_bw.gif) no-repeat bottom left; }
-li:hover a.taskactionbtn { background-image:url(images/arrbtn.gif); }
+a.taskactionbtn { display:block; float:right; height:15px; width:15px; text-decoration:none; background:url(images/icons.gif) 0 0 no-repeat; }
+li:hover a.taskactionbtn { background-position:-16px 0; }
 
 #tasklist.filter-past li, #tasklist.filter-today li, #tasklist.filter-soon li { display:none; }
 #tasklist.filter-past li.past, #tasklist.filter-today li.today, #tasklist.filter-soon li.soon { display:block; }
@@ -118,7 +118,7 @@ div.task-note-area textarea { color:#999999; width:100%; display:block; height:6
 #page_taskedit { position:fixed; z-index:201; background-color:#fdfdfd; padding:8px; border:1px solid #cccccc; width:510px; }
 #page_taskedit .form-row .in500 { width:99%; }
 #page_taskedit .form-row textarea.in500 { height:130px; /*resize:none;*/ }
-.ui-icon-gripsmall-diagonal-se { background-image:url(images/resizegrip.gif); }
+.ui-icon-gripsmall-diagonal-se { background:url(images/icons.gif) 0 -16px; }
 #alltags .tag { font-weight:bold; color:#333333; }
 #alltags .tag:hover { background-color:#999988; color:white; }
 #page_taskedit.mtt-inadd .mtt-inedit { display:none; }
@@ -191,10 +191,10 @@ div.task-note-area textarea { color:#999999; width:100%; display:block; height:6
 .mtt-btnmenu-container li:hover { background-color:#316AC5; color:white; }
 .mtt-btnmenu-container li.mtt-need-list.mtt-disabled { color:#ACA899; }
 .mtt-btnmenu-delimiter { height:0px; border-top:1px solid #cccccc; margin:2px -1px 2px -1px }
-.mtt-btnmenu-container.mtt-btnmenu-hasimages li { padding-left:18px; }
-.mtt-btnmenu-container li.mtt-item-checked { background-image:url(images/checkmark.gif); background-position:left center; background-repeat:no-repeat; }
-
-.mtt-menu-has-submenu { margin-right:15px; background:url(images/arrright.gif) no-repeat center right; }
+.mtt-btnmenu-container.mtt-menu-has-images li { padding-left:18px; }
+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; width:16px; height:16px; background:url(images/icons.gif) -32px -16px no-repeat; }
 
 .mtt-settings-table { width:100%; border-collapse:collapse; }
 .mtt-settings-table th, .mtt-settings-table td { border-bottom:1px solid #dedede; padding:8px; vertical-align:top; }