diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index b06cca0a1..d98f6539c 100644
Binary files a/netbox/project-static/dist/netbox-dark.css and b/netbox/project-static/dist/netbox-dark.css differ
diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index cf06883a9..7eefc861f 100644
Binary files a/netbox/project-static/dist/netbox-light.css and b/netbox/project-static/dist/netbox-light.css differ
diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 7e565c3d5..4a4222488 100644
Binary files a/netbox/project-static/dist/netbox-print.css and b/netbox/project-static/dist/netbox-print.css differ
diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 8ce526985..e962bedfb 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -967,6 +967,17 @@ div.card-overlay {
   max-width: unset;
 }
 
+// Preformatted text blocks
+td pre {
+  margin-bottom: 0
+}
+pre.block {
+  padding: $spacer;
+  background-color: var(--nbx-pre-bg);
+  border: 1px solid var(--nbx-pre-border-color);
+  border-radius: $border-radius;
+}
+
 #django-messages {
   position: fixed;
   right: $spacer;
diff --git a/netbox/project-static/styles/overrides.scss b/netbox/project-static/styles/overrides.scss
index 85e6f0d40..03c72c6e6 100644
--- a/netbox/project-static/styles/overrides.scss
+++ b/netbox/project-static/styles/overrides.scss
@@ -7,11 +7,7 @@ body {
 }
 
 pre {
-  padding: $spacer;
   white-space: pre;
-  background-color: var(--nbx-pre-bg);
-  border: 1px solid var(--nbx-pre-border-color);
-  border-radius: $border-radius;
 }
 
 // Force <small/> elements to make text smaller.
diff --git a/netbox/templates/500.html b/netbox/templates/500.html
index 097699ffc..6cface941 100644
--- a/netbox/templates/500.html
+++ b/netbox/templates/500.html
@@ -26,7 +26,7 @@
                         <p>
                             The complete exception is provided below:
                         </p>
-<pre><strong>{{ exception }}</strong><br />
+<pre class="block"><strong>{{ exception }}</strong><br />
 {{ error }}
 
 Python version: {{ python_version }}
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index 8cd26a116..a926c4ed4 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -64,7 +64,7 @@
         NAPALM Arguments
       </h5>
       <div class="card-body">
-        <pre>{{ object.napalm_args }}</pre>
+        <pre>{{ object.napalm_args|render_json }}</pre>
       </div>
     </div>
     {% include 'inc/panels/custom_fields.html' %}
diff --git a/netbox/templates/extras/inc/configcontext_data.html b/netbox/templates/extras/inc/configcontext_data.html
index 085887748..48ca18543 100644
--- a/netbox/templates/extras/inc/configcontext_data.html
+++ b/netbox/templates/extras/inc/configcontext_data.html
@@ -1,5 +1,5 @@
 {% load helpers %}
 
 <div class="rendered-context-data">
-    <pre>{% if format == 'json' %}{{ data|render_json }}{% elif format == 'yaml' %}{{ data|render_yaml }}{% else %}{{ data }}{% endif %}</pre>
+    <pre class="block">{% if format == 'json' %}{{ data|render_json }}{% elif format == 'yaml' %}{{ data|render_yaml }}{% else %}{{ data }}{% endif %}</pre>
 </div>
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 3a50e09a1..bb2b83360 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -69,7 +69,7 @@
     </div>
     <div role="tabpanel" class="tab-pane" id="source">
       <code class="h6 my-3 d-block">{{ script.filename }}</code>
-      <pre>{{ script.source }}</pre>
+      <pre class="block">{{ script.source }}</pre>
     </div>
   </div>
 {% endblock content-wrapper %}
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index f463b0f2c..3cbd0c611 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -102,11 +102,11 @@
           {% endif %}
       </div>
       <div role="tabpanel" class="tab-pane" id="output">
-          <pre>{{ result.data.output }}</pre>
+          <pre class="block">{{ result.data.output }}</pre>
       </div>
       <div role="tabpanel" class="tab-pane" id="source">
           <p><code>{{ script.filename }}</code></p>
-          <pre>{{ script.source }}</pre>
+          <pre class="block">{{ script.source }}</pre>
       </div>
   </div>
 {% endblock content-wrapper %}