diff --git a/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
index 08cdcd3f60d1..b1dfd6c7f77e 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
@@ -34,7 +34,6 @@
   {% compress css %}
     <link rel="stylesheet" href="{% static 'nprogress/nprogress.css' %}">
     <link rel="stylesheet" href="{% static 'At.js/dist/css/jquery.atwho.min.css' %}">
-    <link rel="stylesheet" href="{% static 'cloudcare/css/webforms.css' %}">
     <link rel="stylesheet" href="{% static 'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css' %}"/>
   {% endcompress %}
   {% compress css %}
diff --git a/corehq/apps/cloudcare/templates/formplayer-common/base.html b/corehq/apps/cloudcare/templates/formplayer-common/base.html
index a0b00144ec25..cd52a7bd25e5 100644
--- a/corehq/apps/cloudcare/templates/formplayer-common/base.html
+++ b/corehq/apps/cloudcare/templates/formplayer-common/base.html
@@ -15,10 +15,6 @@
           rel="stylesheet"
           media="all"
           href="{% static 'cloudcare/less/font-formplayer.less' %}" />
-    <link type="text/css"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/css/webforms.css' %}">
     <link type="text/less"
           rel="stylesheet"
           media="all"
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less
index 75fd091e7ee1..8cdfa45726ca 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less
@@ -22,5 +22,6 @@ version of FORMPLAYER
 @import "formplayer-common/formnav";
 @import "formplayer-common/markdown-table";
 @import "formplayer-common/address";
+@import "formplayer-common/webforms";
 
 @import "debugger/debugger";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/css/webforms.css b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less
similarity index 85%
rename from corehq/apps/hqwebapp/static/cloudcare/css/webforms.css
rename to corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less
index a62c637c5243..9b72d1fa8f62 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/css/webforms.css
+++ b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less
@@ -1,4 +1,3 @@
-
 .webforms {
   max-width: 800px;
   font-family: sans-serif;
@@ -6,21 +5,23 @@
 
 #sync-container {
   padding-top: 9px;
-}
 
-#sync-container #sync-button {
-  margin-bottom: 3px;
-  margin-top: 3px;
+  #sync-button {
+    margin-bottom: 3px;
+    margin-top: 3px;
+  }
 }
 
 /* Override default nprogress bar color to match CommCareHQ */
-#nprogress .bar {
-  background: #4aba32;
-  height: 4px;
-}
+#nprogress {
+  .bar {
+    background: #4aba32;
+    height: 4px;
+  }
 
-#nprogress .peg {
-  box-shadow: 0 0 10px #004ebc, 0 0 5px #004ebc;
+  .peg {
+    box-shadow: 0 0 10px #004ebc, 0 0 5px #004ebc;
+  }
 }
 
 video {
@@ -37,6 +38,14 @@ video {
 
 .widget {
   margin-right: 20px;
+
+  button p {
+    margin-bottom: 0;
+  }
+}
+
+.dirty .widget {
+    background-color: lightblue;
 }
 
 .loading {
@@ -55,7 +64,6 @@ input:invalid {
   border-color: #b94a48;
 }
 
-
 .required .caption::before,
 .required-group .gr-header .caption::before {
   content: '*';
@@ -69,10 +77,6 @@ input:invalid {
   font-weight: normal;
 }
 
-.dirty .widget {
-    background-color: lightblue;
-}
-
 .map {
   width: 100%;
   height: 250px;
diff --git a/corehq/apps/integration/templates/integration/base_cloudcare_template.html b/corehq/apps/integration/templates/integration/base_cloudcare_template.html
index ec90dd054030..6d400cd4a2fd 100644
--- a/corehq/apps/integration/templates/integration/base_cloudcare_template.html
+++ b/corehq/apps/integration/templates/integration/base_cloudcare_template.html
@@ -17,7 +17,6 @@
 
 {% block stylesheets %}
   {% compress css %}
-    <link rel="stylesheet" href="{% static 'cloudcare/css/webforms.css' %}">
     <link rel="stylesheet" href="{% static 'bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css' %}"/>
   {% endcompress %}
   {% compress css %}