diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss
index 12030741fb..6ae3080dd7 100644
--- a/app/assets/sass/application.scss
+++ b/app/assets/sass/application.scss
@@ -1,5 +1,6 @@
 // global styles for <a> and <p> tags
 $govuk-global-styles: true;
+$govuk-new-link-styles: true;
 
 // We can't mount GOV.UK Frontend's assets at root as it's done automatically by the extensions framework.
 $govuk-assets-path: '/govuk/assets/';
diff --git a/app/assets/sass/patterns/_step-by-step-nav.scss b/app/assets/sass/patterns/_step-by-step-nav.scss
index 0cd4e5701b..cebea1b1ea 100644
--- a/app/assets/sass/patterns/_step-by-step-nav.scss
+++ b/app/assets/sass/patterns/_step-by-step-nav.scss
@@ -94,10 +94,10 @@ $top-border: solid 2px govuk-colour("mid-grey", $legacy: "grey-3");
 
 .app-step-nav__button--controls {
   @include step-nav-font(14, $line-height: 1);
+  @include govuk-link-common;
   position: relative;
   z-index: 1; // this and relative position stops focus outline underlap with border of accordion
   padding: .5em 0;
-  text-decoration: underline;
 
   .app-step-nav--large & {
     @include step-nav-font(14, $tablet-size: 16, $line-height: 1);
@@ -271,7 +271,8 @@ $top-border: solid 2px govuk-colour("mid-grey", $legacy: "grey-3");
     }
 
     .app-step-nav__toggle-link {
-      text-decoration: underline;
+      @include govuk-link-common;
+      @include govuk-link-hover-decoration;
     }
   }
 
diff --git a/docs/assets/sass/docs.scss b/docs/assets/sass/docs.scss
index 3e73db1093..958849f4be 100644
--- a/docs/assets/sass/docs.scss
+++ b/docs/assets/sass/docs.scss
@@ -1,6 +1,8 @@
 // We can't mount GOV.UK Frontend's assets at root as it's done automatically by the extensions framework.
 $govuk-assets-path: '/govuk/assets/';
 
+$govuk-new-link-styles: true;
+
 @import "node_modules/govuk-frontend/govuk/all";
 
 img{