diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/slider/DarkSliderUI.java b/core/src/main/java/com/github/weisj/darklaf/ui/slider/DarkSliderUI.java
index b1cd3ac7..a4024acd 100644
--- a/core/src/main/java/com/github/weisj/darklaf/ui/slider/DarkSliderUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/slider/DarkSliderUI.java
@@ -40,6 +40,7 @@ import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;
+import com.github.weisj.swingdsl.visualpadding.VisualPaddingProvider;
 
 /** @author Jannis Weis */
 public class DarkSliderUI extends BasicSliderUI {
@@ -161,7 +162,21 @@ public class DarkSliderUI extends BasicSliderUI {
     @Override
     public int getBaseline(JComponent c, int width, int height) {
         if (isHorizontal() && PropertyUtil.getBooleanProperty(c, KEY_USE_TRACK_AS_BASELINE)) {
-            return trackRect.y + trackRect.height / 2;
+            int thumbY = focusInsets.top + trackBuffer;
+            if (isPlainThumb()) {
+                Dimension thumbSize = getThumbSize();
+                return thumbY + thumbSize.height - focusBorderSize;
+            } else {
+                Icon icon = getThumbIcon();
+                int baseline = thumbY + icon.getIconHeight();
+                if (icon instanceof RotatableIcon) {
+                    icon = ((RotatableIcon) icon).getIcon();
+                }
+                if (icon instanceof VisualPaddingProvider) {
+                    baseline -= ((VisualPaddingProvider) icon).getVisualPaddings(slider).bottom;
+                }
+                return baseline;
+            }
         } else {
             return super.getBaseline(c, width, height);
         }
@@ -260,6 +275,7 @@ public class DarkSliderUI extends BasicSliderUI {
      * @param direction the direction
      */
     public void scrollByBlock(final int direction) {
+        // noinspection SynchronizeOnNonFinalField
         synchronized (slider) {
             int blockIncrement = (slider.getMaximum() - slider.getMinimum()) / 10;
             if (blockIncrement == 0) {
@@ -289,6 +305,7 @@ public class DarkSliderUI extends BasicSliderUI {
      * @param direction the direction
      */
     public void scrollByUnit(final int direction) {
+        // noinspection SynchronizeOnNonFinalField
         synchronized (slider) {
             int delta = ((direction > 0) ? POSITIVE_SCROLL : NEGATIVE_SCROLL);
 
@@ -401,6 +418,7 @@ public class DarkSliderUI extends BasicSliderUI {
             int bw = 2 * getFocusBorderSize();
             return new Dimension(plainThumbRadius + bw, plainThumbRadius + bw);
         }
+        // noinspection SuspiciousNameCombination
         return isHorizontal() ? new Dimension(thumbSize.width, thumbSize.height)
                 : new Dimension(thumbSize.height, thumbSize.width);
     }
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/control/slider.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/control/slider.svg
index 90a89d13..78edff3a 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/control/slider.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/control/slider.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23">
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23" visualPadding="2 2 2 2">
     <defs id="colors">
         <linearGradient id="Icons.Slider.activeFillColor">
             <stop offset="0" stop-color="#43494A"/>
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/control/sliderDisabled.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/control/sliderDisabled.svg
index e2a2cea2..d1c5a31e 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/control/sliderDisabled.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/control/sliderDisabled.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 22">
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 22" visualPadding="2 2 2 2">
     <defs id="colors">
         <linearGradient id="Icons.SliderDisabled.inactiveFillColor">
             <stop offset="0" stop-color="#3C3F41"/>
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/control/sliderFocused.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/control/sliderFocused.svg
index 1157a9cb..7e44a826 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/control/sliderFocused.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/control/sliderFocused.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23">
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23" visualPadding="2 2 2 2">
     <defs id="colors">
         <linearGradient id="Icons.SliderFocused.activeFillColor">
             <stop offset="0" stop-color="#43494A"/>
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSlider.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSlider.svg
index 02818a35..253faf20 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSlider.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSlider.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23">
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23" visualPadding="2 2 2 2">
     <defs id="colors">
         <linearGradient id="Icons.VolumeSlider.activeFillColor">
             <stop offset="0" stop-color="#A0A0A0"/>
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSliderDisabled.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSliderDisabled.svg
index 4283bac9..609320af 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSliderDisabled.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSliderDisabled.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23">
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23" visualPadding="2 2 2 2">
     <defs id="colors">
         <linearGradient id="Icons.VolumeSliderDisabled.inactiveFillColor">
             <stop offset="0" stop-color="#3C3F41"/>
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSliderFocused.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSliderFocused.svg
index 4009a90f..240afcdf 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSliderFocused.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/control/volumeSliderFocused.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23">
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="23" viewBox="0 0 20 23" visualPadding="2 2 2 2">
     <defs id="colors">
         <linearGradient id="Icons.VolumeSliderFocused.activeFillColor">
             <stop offset="0" stop-color="#A0A0A0"/>