diff --git a/src/webui/css/style.css b/src/webui/css/style.css
index 9e58b13b6..416d8b11d 100644
--- a/src/webui/css/style.css
+++ b/src/webui/css/style.css
@@ -262,8 +262,11 @@ a.propButton img {
 
 /* Mocha Customization */
 #mochaToolbar .divider {
-        background: url(../images/skin/toolbox-divider.gif) left center no-repeat;
-        padding: 25px 0 0 14px;
+	background-image: url(../images/skin/toolbox-divider.gif);
+	background-repeat: no-repeat;
+        background-position: left center;
+        padding-left: 14px;
+	padding-top: 15px;
 }
 
 .MyMenuIcon {
diff --git a/src/webui/html/index.html b/src/webui/html/index.html
index f5a69f8bc..b6e4affdd 100644
--- a/src/webui/html/index.html
+++ b/src/webui/html/index.html
@@ -69,16 +69,17 @@
 				</ul>
 			</div>
 			<div id="mochaToolbar">
-				<a id="uploadButton"><img class="mochaToolButton" title="_(Download local torrent)" src="theme/list-add" width="32" height="32" onload="fixPNG(this)"/></a>
-				<a id="downloadButton"><img class="mochaToolButton" title="_(Download from URL)" src="theme/insert-link" width="32" height="32" onload="fixPNG(this)"/></a>
-			  <a id="deleteButton" class="divider"><img class="mochaToolButton" title="_(Delete)" src="theme/list-remove" width="32" height="32" onload="fixPNG(this)"/></a>
-				<a id="resumeButton" class="divider"><img class="mochaToolButton" title="_(Start)" src="theme/media-playback-start" width="32" height="32" onload="fixPNG(this)"/></a>
-				<a id="pauseButton"><img class="mochaToolButton" title="_(Pause)" src="theme/media-playback-pause" width="32" height="32" onload="fixPNG(this)"/></a>
+&nbsp;&nbsp;
+				<a id="uploadButton"><img class="mochaToolButton" title="_(Download local torrent)" src="theme/list-add" width="24" height="24" onload="fixPNG(this)"/></a>
+				<a id="downloadButton"><img class="mochaToolButton" title="_(Download from URL)" src="theme/insert-link" width="24" height="24" onload="fixPNG(this)"/></a>
+			  <a id="deleteButton" class="divider"><img class="mochaToolButton" title="_(Delete)" src="theme/list-remove" width="24" height="24" onload="fixPNG(this)"/></a>
+				<a id="resumeButton" class="divider"><img class="mochaToolButton" title="_(Start)" src="theme/media-playback-start" width="24" height="24" onload="fixPNG(this)"/></a>
+				<a id="pauseButton"><img class="mochaToolButton" title="_(Pause)" src="theme/media-playback-pause" width="24" height="24" onload="fixPNG(this)"/></a>
 				<span id="queueingButtons">
-				<a id="decreasePrioButton" class="divider"><img class="mochaToolButton" title="_(Decrease priority)" src="theme/go-down" width="32" height="32" onload="fixPNG(this)"/></a>
-				<a id="increasePrioButton"><img class="mochaToolButton" title="_(Increase priority)" src="theme/go-up" width="32" height="32" onload="fixPNG(this)"/></a>
+				<a id="decreasePrioButton" class="divider"><img class="mochaToolButton" title="_(Decrease priority)" src="theme/go-down" width="24" height="24" onload="fixPNG(this)"/></a>
+				<a id="increasePrioButton"><img class="mochaToolButton" title="_(Increase priority)" src="theme/go-up" width="24" height="24" onload="fixPNG(this)"/></a>
 				</span>
-				<a id="preferencesButton" class="divider"><img class="mochaToolButton" title="_(Preferences)" src="theme/preferences-system" width="32" height="32" onload="fixPNG(this)"/></a>
+				<a id="preferencesButton" class="divider"><img class="mochaToolButton" title="_(Preferences)" src="theme/preferences-system" width="24" height="24" onload="fixPNG(this)"/></a>
 			</div>
 		</div>
 		<div id="pageWrapper"><span id="error_div"></span>