diff --git a/demo/Views/CSSView.vala b/demo/Views/CSSView.vala
index 6e70df169..6ee453a60 100644
--- a/demo/Views/CSSView.vala
+++ b/demo/Views/CSSView.vala
@@ -84,21 +84,6 @@ public class CSSView : DemoPage {
         card_box.append (card);
         card_box.append (card_checkered);
 
-        var terminal_label = new Granite.HeaderLabel ("\"terminal\" style class");
-
-        var terminal = new Gtk.Label ("[ 73%] Linking C executable granite-demo\n[100%] Built target granite-demo") {
-            selectable = true,
-            wrap = true,
-            xalign = 0,
-            yalign = 0
-        };
-
-        var terminal_scroll = new Gtk.ScrolledWindow () {
-            min_content_height = 70,
-            child = terminal
-        };
-        terminal_scroll.add_css_class (Granite.STYLE_CLASS_TERMINAL);
-
         var accent_color_label = new Granite.HeaderLabel ("Colored labels and icons");
 
         var accent_color_box = new Gtk.Box (HORIZONTAL, 6);
@@ -139,8 +124,6 @@ public class CSSView : DemoPage {
         };
         box.append (card_header);
         box.append (card_box);
-        box.append (terminal_label);
-        box.append (terminal_scroll);
         box.append (accent_color_label);
         box.append (accent_color_box);
         box.append (success_color_box);
diff --git a/lib/Constants.vala b/lib/Constants.vala
index 86702c0e3..273d5b007 100644
--- a/lib/Constants.vala
+++ b/lib/Constants.vala
@@ -131,6 +131,7 @@ namespace Granite {
      * When used with {@link Gtk.Label} this style includes internal padding. When used with {@link Gtk.TextView}
      * interal padding will need to be set with {@link Gtk.Container.border_width}
      */
+    [Version (deprecated = true, deprecated_since = "9.0.0")]
     public const string STYLE_CLASS_TERMINAL = "terminal";
     /**
      * Style class for title label text in a {@link Granite.MessageDialog}
diff --git a/lib/Styles/Granite/_classes.scss b/lib/Styles/Granite/_classes.scss
index eaf129810..05436f6ff 100644
--- a/lib/Styles/Granite/_classes.scss
+++ b/lib/Styles/Granite/_classes.scss
@@ -48,3 +48,21 @@ paper {
     font-family: monospace;
 }
 
+.terminal {
+    font-family: monospace;
+
+    background-color: $fg-color;
+    color: bg-color(0);
+
+    padding: rem(12px) rem(18px);
+
+    & selection {
+        background-color: bg-color(0);
+        color: $fg-color;
+
+        &:backdrop {
+            // Cancelling values set in non-terminal selection
+            background-color: inherit;
+        }
+    }
+}
diff --git a/lib/Widgets/MessageDialog.vala b/lib/Widgets/MessageDialog.vala
index f0fdbaa08..17047512f 100644
--- a/lib/Widgets/MessageDialog.vala
+++ b/lib/Widgets/MessageDialog.vala
@@ -320,7 +320,9 @@ public class Granite.MessageDialog : Granite.Dialog {
                 min_content_height = 70,
                 child = details_view
             };
-            scroll_box.add_css_class (Granite.STYLE_CLASS_TERMINAL);
+            // This is an undocumented style in the Granite stylesheet, not
+            // intended to be used outside of a few system contexts 
+            scroll_box.add_css_class ("terminal");
 
             expander = new Gtk.Expander (_("Details")) {
                 child = scroll_box