diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index d9b5d6ae11..baf6f5e0a2 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -63,7 +63,6 @@ export default Service.extend({
     audioCard: feature('audioCard'),
     videoCard: feature('videoCard'),
     productCard: feature('productCard'),
-    quoteStyles: feature('quoteStyles'),
     beforeAfterCard: feature('beforeAfterCard'),
     richTwitterNewsletters: feature('richTwitterNewsletters'),
     tweetGridCard: feature('tweetGridCard'),
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 81719f9ad4..2e23d8729d 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -430,19 +430,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Cardmageddon - Quote styles</h4>
-                            <p class="gh-expandable-description">
-                               Toggle through quote styles by clicking the quote toolbar icon
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                           <GhFeatureFlag @flag="quoteStyles" />
-                        </div>
-                    </div>
-                </div>
                 <div class="gh-expandable-block">
                     <div class="gh-expandable-header">
                         <div>
diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.hbs
index 91422cb69d..d705755fff 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-toolbar.hbs
@@ -45,35 +45,22 @@
     <li class="ma0 ml1 mr1 lh-solid kg-action-bar-divider bg-darkgrey-l2 h5" role="separator"></li>
 
     {{#unless this.basicOnly}}
-        {{#if feature.quoteStyles}}
-            <li class="ma0 lh-solid">
-                <button
-                    type="button"
-                    title="Quote"
-                    class="dib dim-lite link h9 w9 nudge-top--1"
-                    {{action "toggleQuoteSection"}}
-                >
-                    {{#if this.activeSectionTagNames.isBlockquote}}
-                        {{svg-jar "koenig/kg-quote-1" class="fill-green w4 h4"}}
-                    {{else if this.activeSectionTagNames.isAside}}
-                        {{svg-jar "koenig/kg-quote-2" class="fill-green w4 h4"}}
-                    {{else}}
-                        {{svg-jar "koenig/kg-quote" class="fill-white w4 h4"}}
-                    {{/if}}
-                </button>
-            </li>
-        {{else}}
-            <li class="ma0 lh-solid">
-                <button
-                    type="button"
-                    title="Quote"
-                    class="dib dim-lite link h9 w9 nudge-top--1"
-                    {{action "toggleSection" "blockquote"}}
-                >
-                    {{svg-jar "koenig/kg-quote" class=(concat (if this.activeSectionTagNames.isBlockquote "fill-green-l2" "fill-white") " w4 h4")}}
-                </button>
-            </li>
-        {{/if}}
+        <li class="ma0 lh-solid">
+            <button
+                type="button"
+                title="Quote"
+                class="dib dim-lite link h9 w9 nudge-top--1"
+                {{action "toggleQuoteSection"}}
+            >
+                {{#if this.activeSectionTagNames.isBlockquote}}
+                    {{svg-jar "koenig/kg-quote-1" class="fill-green w4 h4"}}
+                {{else if this.activeSectionTagNames.isAside}}
+                    {{svg-jar "koenig/kg-quote-2" class="fill-green w4 h4"}}
+                {{else}}
+                    {{svg-jar "koenig/kg-quote" class="fill-white w4 h4"}}
+                {{/if}}
+            </button>
+        </li>
     {{/unless}}
     <li class="ma0 lh-solid">
         <button