diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index f4e9d6b098f..46c0ec6a67f 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -426,6 +426,8 @@ template <typename PixelType, typename PixelFormat>
 void VectorRendererSpec<PixelType, PixelFormat>::
 colorFill(PixelType *first, PixelType *last, PixelType color) {
 	register int count = (last - first);
+	if (!count)
+		return;
 	register int n = (count + 7) >> 3;
 	switch (count % 8) {
 	case 0: do {
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index d483e06e827..671fe55f95c 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -706,14 +706,7 @@ void ThemeEngine::drawSlider(const Common::Rect &r, int width, WidgetStateInfo s
 
 	drawWidgetBackground(r, 0, kWidgetBackgroundSlider, kStateEnabled);
 
-	// TODO/FIXME: This seems to prevent displaying of
-	// slider widgets in low ranges. When disabling it
-	// the slider is shown, but it creates gfx glitches
-	// in modern theme. Modern theme uses "roundedsq"
-	// as drawing function, thus the real bug should be
-	// in VectorRenderer::drawRoundedSquare.
-	if (width > r.width() * 5 / 100)
-		queueDD(dd, r2);
+	queueDD(dd, r2);
 }
 
 void ThemeEngine::drawScrollbar(const Common::Rect &r, int sliderY, int sliderHeight, ScrollbarState scrollState, WidgetStateInfo state) {