diff --git a/ChangeLog b/ChangeLog
index 1bb5a3e60..6a44be294 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-07-06	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/gui/widgets/combobox.cpp:
+	draw text at correct position in win32-version
+
+	* src/core/drumsynth.cpp:
+	when building for win32 define powf() as pow() due to symbol-conflicts
+	in win32-libm
+
+	* data/themes/default/style.css:
+	fixed font-color for what's-this-popups so that they're readable
+
 2008-07-05	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/stk/mallets/mallets.cpp:
diff --git a/src/gui/widgets/combobox.cpp b/src/gui/widgets/combobox.cpp
index 17bfa87fc..455fe524b 100644
--- a/src/gui/widgets/combobox.cpp
+++ b/src/gui/widgets/combobox.cpp
@@ -201,7 +201,7 @@ void comboBox::paintEvent( QPaintEvent * _pe )
 	if( model()->size() > 0 )
 	{
 		p.setFont( font() );
-		p.setClipRect( QRect( 5, 2, width() - CB_ARROW_BTN_WIDTH - 8,
+		p.setClipRect( QRect( 4, 2, width() - CB_ARROW_BTN_WIDTH - 8,
 							height() - 2 ) );
 		QPixmap pm = model()->currentData() ?
 				model()->currentData()->pixmap() : QPixmap();
@@ -216,12 +216,11 @@ void comboBox::paintEvent( QPaintEvent * _pe )
 			p.drawPixmap( tx, 3, pm );
 			tx += pm.width() + 2;
 		}
+		const int y = ( height()+p.fontMetrics().height() ) /2;
 		p.setPen( QColor( 64, 64, 64 ) );
-		p.drawText( tx+1, p.fontMetrics().height()-2,
-						model()->currentText() );
+		p.drawText( tx+1, y-2, model()->currentText() );
 		p.setPen( QColor( 224, 224, 224 ) );
-		p.drawText( tx, p.fontMetrics().height()-3,
-						model()->currentText() );
+		p.drawText( tx, y-3, model()->currentText() );
 	}
 }