diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index e44114b..0032155 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.18.4] - 2023-11-21
+
+- TMS-997: Change textblock button border-color if no bg-color is selected
+
 ## [1.18.3] - 2023-10-23
 
 - TMS-970: Add image meta to content-columns component
diff --git a/assets/styles/base/_base.scss b/assets/styles/base/_base.scss
index a0b2b08..d083d0c 100644
--- a/assets/styles/base/_base.scss
+++ b/assets/styles/base/_base.scss
@@ -26,5 +26,13 @@ main {
         > p > a {
             text-decoration: underline;
         }
+
+        .button.is-no_color-invert {
+            border-color: $primary;
+
+            &:hover {
+                border-color: $color-white;
+            }
+        }
     }
 }
diff --git a/style.css b/style.css
index 399d843..08cae64 100644
--- a/style.css
+++ b/style.css
@@ -1,7 +1,7 @@
 /*
  * Theme Name:  TMS Theme Muumimuseo
  * Description: Tampere Multisite Muumimuseo Theme
- * Version:     1.18.2
+ * Version:     1.18.4
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Template:    tms-theme-base