diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aac5d4913a..61c4d4c681d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -148,7 +148,21 @@
   [#12626](https://github.com/mixxxdj/mixxx/pull/12626)
   [#12577](https://github.com/mixxxdj/mixxx/pull/12577)
 
-## [2.4.0](https://launchpad.net/mixxx/+milestone/2.4.0) (2024-02-16)
+## [2.4.1](https://github.com/mixxxdj/mixxx/milestone/41?closed=1) (unreleased)
+
+### Controller Mappings
+
+* Pioneer DDJ-FLX4 mapping improvements [#12842](https://github.com/mixxxdj/mixxx/pull/12842)
+* Traktor S3: Fix mapping crash on macOS [#12840](https://github.com/mixxxdj/mixxx/pull/12840)
+
+### Target Support
+
+* Fix various minor build issues
+  [#12853](https://github.com/mixxxdj/mixxx/pull/12853)
+  [#12847](https://github.com/mixxxdj/mixxx/pull/12847)
+  [#12822](https://github.com/mixxxdj/mixxx/pull/12822)
+
+## [2.4.0](https://github.com/mixxxdj/mixxx/milestone/15?closed=1) (2024-02-16)
 
 ### Music Library: Tracks Table & Track Menu
 
@@ -587,7 +601,7 @@
 * Log warning if deprecated control is used [#11972](https://github.com/mixxxdj/mixxx/pull/11972)
 * ControlObject alias improvements [#11973](https://github.com/mixxxdj/mixxx/pull/11973)
 * Keyboard mapping: Repeat certain control actions if key is held [#12474](https://github.com/mixxxdj/mixxx/pull/12474)
-* Keyboard mapping: Return triggers doubleclick, move Preview functions to P / Shift+P [#12639](https://github.com/mixxxdj/mixxx/pull/12639)
+* Keyboard mapping: Return triggers double-click, move Preview functions to P / Shift+P [#12639](https://github.com/mixxxdj/mixxx/pull/12639)
 * Keyboard mapping: Various fixes [#12730](https://github.com/mixxxdj/mixxx/pull/12730)
 * Update keyboard sheet [#12578](https://github.com/mixxxdj/mixxx/pull/12578)
 * Logging: Add support for `QT_MESSAGE_PATTERN` environment variable
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index 4a679bddcb1..4e57e1a4d18 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -96,7 +96,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.5.0" type="development" date="2024-01-15" timestamp="1705300139">
+    <release version="2.5.0" type="development" date="2024-02-23" timestamp="1708721847">
       <description>
  <p>
   Features
@@ -560,6 +560,34 @@
    #12577
   </li>
  </ul>
+</description>
+    </release>
+    <release version="2.4.1" type="development" date="2024-02-23" timestamp="1708721847">
+      <description>
+ <p>
+  Controller Mappings
+ </p>
+ <ul>
+  <li>
+   Pioneer DDJ-FLX4 mapping improvements
+   #12842
+  </li>
+  <li>
+   Traktor S3: Fix mapping crash on macOS
+   #12840
+  </li>
+ </ul>
+ <p>
+  Target Support
+ </p>
+ <ul>
+  <li>
+   Fix various minor build issues
+   #12853
+   #12847
+   #12822
+  </li>
+ </ul>
 </description>
     </release>
     <release version="2.4.0" type="stable" date="2024-02-16" timestamp="1708041600">
@@ -1665,7 +1693,7 @@
    #12474
   </li>
   <li>
-   Keyboard mapping: Return triggers doubleclick, move Preview functions to P / Shift+P
+   Keyboard mapping: Return triggers double-click, move Preview functions to P / Shift+P
    #12639
   </li>
   <li>
diff --git a/src/widget/controlwidgetconnection.cpp b/src/widget/controlwidgetconnection.cpp
index b04a1ca3323..9fbf52a04b9 100644
--- a/src/widget/controlwidgetconnection.cpp
+++ b/src/widget/controlwidgetconnection.cpp
@@ -178,9 +178,6 @@ void ControlWidgetPropertyConnection::slotControlValueChanged(double v) {
 
     m_propertyValue = vParameter;
 
-    // According to http://stackoverflow.com/a/3822243 this is the least
-    // expensive way to restyle just this widget.
-    pWidget->style()->unpolish(pWidget);
     pWidget->style()->polish(pWidget);
 
     // These calls don't always trigger the repaint, so call it explicitly.
diff --git a/src/widget/wcolorpicker.cpp b/src/widget/wcolorpicker.cpp
index 6bc3296a320..129d18cdc8a 100644
--- a/src/widget/wcolorpicker.cpp
+++ b/src/widget/wcolorpicker.cpp
@@ -234,7 +234,6 @@ void WColorPicker::setColorButtonChecked(const mixxx::RgbColor::optional_t& colo
         pButton->setIcon(QIcon(checked ? ":/images/ic_checkmark.svg" : ""));
     }
     // This is needed to re-apply skin styles (e.g. to show/hide a checkmark icon)
-    pButton->style()->unpolish(pButton);
     pButton->style()->polish(pButton);
 }
 
diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp
index 454c024782b..5da332b5626 100644
--- a/src/widget/wpushbutton.cpp
+++ b/src/widget/wpushbutton.cpp
@@ -283,12 +283,6 @@ void WPushButton::setPixmapBackground(const PixmapSource& source,
 void WPushButton::restyleAndRepaint() {
     emit displayValueChanged(readDisplayValue());
 
-    // According to http://stackoverflow.com/a/3822243 this is the least
-    // expensive way to restyle just this widget.
-    // Since we expect button connections to not change at high frequency we
-    // don't try to detect whether things have changed for WPushButton, we just
-    // re-render.
-    style()->unpolish(this);
     style()->polish(this);
 
     // These calls don't always trigger the repaint, so call it explicitly.
diff --git a/src/widget/wwidgetgroup.cpp b/src/widget/wwidgetgroup.cpp
index a2385834f31..497be95fa29 100644
--- a/src/widget/wwidgetgroup.cpp
+++ b/src/widget/wwidgetgroup.cpp
@@ -236,7 +236,6 @@ void WWidgetGroup::setHighlight(int highlight) {
         return;
     }
     m_highlight = highlight;
-    style()->unpolish(this);
     style()->polish(this);
     update();
     emit highlightChanged(m_highlight);