diff --git a/endpoints/common.py b/endpoints/common.py
index 2852e1485..28c5f50cb 100644
--- a/endpoints/common.py
+++ b/endpoints/common.py
@@ -167,6 +167,10 @@ def render_page_template(name, route_data=None, **kwargs):
   external_styles = get_external_css(local=not use_cdn)
   external_scripts = get_external_javascript(local=not use_cdn)
 
+  # Add Stripe checkout if billing is enabled.
+  if features.BILLING:
+    external_scripts.append('//checkout.stripe.com/checkout.js')
+
   def add_cachebusters(filenames):
     cachebusters = get_cache_busters()
     for filename in filenames:
diff --git a/external_libraries.py b/external_libraries.py
index 05989872e..549d23850 100644
--- a/external_libraries.py
+++ b/external_libraries.py
@@ -14,7 +14,6 @@ EXTERNAL_JS = [
   'cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.2.0/js/bootstrap-datepicker.min.js',
   'cdn.jsdelivr.net/g/bootbox@4.1.0,underscorejs@1.5.2,restangular@1.2.0,d3js@3.3.3,momentjs',
   'cdn.ravenjs.com/1.1.14/jquery,native/raven.min.js',
-  'checkout.stripe.com/checkout.js',
 ]
 
 EXTERNAL_CSS = [
diff --git a/static/img/quay-icon-stripe.png b/static/img/quay-icon-stripe.png
index b7f56fbaf..fc03ab882 100644
Binary files a/static/img/quay-icon-stripe.png and b/static/img/quay-icon-stripe.png differ