diff --git a/views/_tags.erb b/views/_tags.erb
index 5b41a8d3..30d49d40 100644
--- a/views/_tags.erb
+++ b/views/_tags.erb
@@ -32,7 +32,7 @@
     </div>
     <div class="modal-footer">
       <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
-      <button type="submit" class="btn btn-Action">Add Tag</button>
+      <button type="submit" class="btn-Action">Add Tag</button>
     </div>
   </form>
 </div>
diff --git a/views/admin.erb b/views/admin.erb
index 9ab5ce6c..cb0e2df6 100644
--- a/views/admin.erb
+++ b/views/admin.erb
@@ -22,7 +22,7 @@
         <%== csrf_token_input_html %>
         <p>Site Name:</p>
         <p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p>
-        <p><input class="btn btn-Action" type="submit" value="Ban"></p>
+        <p><input class="btn-Action" type="submit" value="Ban"></p>
       </form>
     </div>
     <div class="col col-50">
@@ -33,7 +33,7 @@
         <p>
           <input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off">
         </p>
-        <p><input class="btn btn-Action" type="submit" value="Mark NSFW"></p>
+        <p><input class="btn-Action" type="submit" value="Mark NSFW"></p>
       </form>
     </div>
   </div>
@@ -46,7 +46,7 @@
         <p>All sites with this IP address will be removed.</p>
         <p>Site Name:</p>
         <p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p>
-        <p><input class="btn btn-Action" type="submit" value="Ban"></p>
+        <p><input class="btn-Action" type="submit" value="Ban"></p>
       </form>
     </div>
 
@@ -58,7 +58,7 @@
         <p>This site will be upgraded to the supporter plan.</p>
         <p>Site Name:</p>
         <p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p>
-        <p><input class="btn btn-Action" type="submit" value="Upgrade to Supporter"></p>
+        <p><input class="btn-Action" type="submit" value="Upgrade to Supporter"></p>
       </form>
     </div>
   </div>
diff --git a/views/dashboard.erb b/views/dashboard.erb
index b60a97a7..8e136027 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -181,7 +181,7 @@
         </div>
         <div class="modal-footer">
           <button class="btn cancel" data-dismiss="modal" aria-hidden="true" type="button">Cancel</button>
-          <button class="btn btn-Action btn-danger" type="button" onclick="fileDelete()"><i class="fa fa-trash" title="Delete"></i>Delete</button>
+          <button class="btn-Action btn-danger" type="button" onclick="fileDelete()"><i class="fa fa-trash" title="Delete"></i>Delete</button>
         </div>
       </div>
 
@@ -275,7 +275,7 @@
     </div>
     <div class="modal-footer">
       <button type="button" class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
-      <button type="submit" class="btn btn-Action">Create</button>
+      <button type="submit" class="btn-Action">Create</button>
     </div>
   </form>
 </div>
diff --git a/views/home.erb b/views/home.erb
index 01a0f52b..5f628438 100644
--- a/views/home.erb
+++ b/views/home.erb
@@ -107,8 +107,8 @@
         <a href="//<%= site.host %>" class="large-portrait" style="background-image:url(<%= site.screenshot_url('index.html', '540x405') %>);"></a>
 
         <div class="news-profile-button">
-          <a href="/site/<%= site.username %>" class="btn btn-Action"><i class="fa fa-user"></i> Profile</a>
-          <a href="#" id="shareButton" class="btn btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site} %>'><i class="fa fa-share-alt"></i> Share</a>
+          <a href="/site/<%= site.username %>" class="btn-Action"><i class="fa fa-user"></i> Profile</a>
+          <a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site} %>'><i class="fa fa-share-alt"></i> Share</a>
         </div>
 
         <%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %>
diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb
index 02161a02..c0a8f255 100644
--- a/views/plan/_pricing.erb
+++ b/views/plan/_pricing.erb
@@ -394,7 +394,7 @@
     </div>
     <div class="modal-footer">
       <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
-      <button type="submit" class="btn btn-Action">Upgrade</button>
+      <button type="submit" class="btn-Action">Upgrade</button>
     </div>
   </form>
 </div>
diff --git a/views/settings/account.erb b/views/settings/account.erb
index 7f49c35b..223fe031 100644
--- a/views/settings/account.erb
+++ b/views/settings/account.erb
@@ -63,7 +63,7 @@
     </div>
     <div class="modal-footer">
       <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
-      <button type="submit" class="btn btn-Action">Permanently Delete Site</button>
+      <button type="submit" class="btn-Action">Permanently Delete Site</button>
     </div>
   </form>
 </div>
diff --git a/views/settings/site.erb b/views/settings/site.erb
index c7339aad..de7fc757 100644
--- a/views/settings/site.erb
+++ b/views/settings/site.erb
@@ -78,7 +78,7 @@
     </div>
     <div class="modal-footer">
       <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
-      <button type="submit" class="btn btn-Action">Permanently Delete Site</button>
+      <button type="submit" class="btn-Action">Permanently Delete Site</button>
     </div>
   </form>
 </div>
diff --git a/views/site.erb b/views/site.erb
index 2a7eb8d4..ec880b25 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -153,7 +153,7 @@
     </div>
     <div class="modal-footer">
       <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
-      <button type="submit" class="btn btn-Action">Report</button>
+      <button type="submit" class="btn-Action">Report</button>
     </div>
   </form>
 </div>
@@ -179,7 +179,7 @@
     </div>
     <div class="modal-footer">
       <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
-      <button type="submit" class="btn btn-Action">Block Site</button>
+      <button type="submit" class="btn-Action">Block Site</button>
     </div>
   </form>
 </div>
\ No newline at end of file
diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb
index 339fa4d1..fb953cbf 100644
--- a/views/site_files/text_editor.erb
+++ b/views/site_files/text_editor.erb
@@ -69,8 +69,8 @@
           </optgroup>
         </select>
       </div>
-      <a id="saveButton" class="btn btn-Action" href="#" onclick="saveTextFile(false); return false" style="opacity: 0.5"><i class="fa fa-save"></i>Save</a>
-      <a class="btn btn-Action" href="//<%= current_site.host %>/<%= @filename %>" target="_blank">View</a>
+      <a id="saveButton" class="btn-Action" href="#" onclick="saveTextFile(false); return false" style="opacity: 0.5"><i class="fa fa-save"></i>Save</a>
+      <a class="btn-Action" href="//<%= current_site.host %>/<%= @filename %>" target="_blank">View</a>
       <a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site, page_uri: "#{current_site.uri}/#{@filename}"} %>'>Share</a>
     <!-- <a id="saveAndExitButton" class="btn-Action" href="#" onclick="saveTextFile(true); return false" style="opacity: 0.5"><i class="fa fa-save"></i>&nbsp;&nbsp;Save and Exit</a> -->
       <div id="editorUpdates" class="tooltip fade bottom in hidden" style="top: 90px;right: 12.5em;">
diff --git a/views/welcome.erb b/views/welcome.erb
index f8210e21..a1726f25 100644
--- a/views/welcome.erb
+++ b/views/welcome.erb
@@ -20,7 +20,7 @@ You can support our quest to bring back the creative, independent web by upgradi
         </div>
       </div>
       <div class="row content txt-Center">
-        <a href="/" class="btn btn-Action">Continue</a>
+        <a href="/" class="btn-Action">Continue</a>
       </div>
     </div>
 
@@ -91,7 +91,7 @@ You can support our quest to bring back the creative, independent web by upgradi
       </div>
 
       <div class="row content txt-Center">
-        <a href="/" class="btn btn-Action" onclick="$('#upgradeForm').submit(); return false">
+        <a href="/" class="btn-Action" onclick="$('#upgradeForm').submit(); return false">
           Upgrade for $<%= Site::PLAN_FEATURES[:supporter][:price] %>/mo
         </a>
         or pay with <a href="/plan/alternate/">PayPal</a> or <a href="/plan/alternate/">Bitcoin</a>
diff --git a/views/welcome_mockup.erb b/views/welcome_mockup.erb
index c84e9e17..da47c389 100644
--- a/views/welcome_mockup.erb
+++ b/views/welcome_mockup.erb
@@ -20,7 +20,7 @@ You can support our quest to bring back the creative, independent web by upgradi
         </div>
       </div>
       <div class="row content txt-Center">
-        <a href="/" class="btn btn-Action">Continue</a>
+        <a href="/" class="btn-Action">Continue</a>
       </div>
     </div>
   
@@ -60,7 +60,7 @@ You can support our quest to bring back the creative, independent web by upgradi
       </div>
       
       <div class="row content txt-Center">
-        <a href="/" class="btn btn-Action">Upgrade for 
+        <a href="/" class="btn-Action">Upgrade for 
         <% if parent_site && parent_site.legacy_supporter? %>
           $<%= Site::LEGACY_SUPPORTER_PRICES[parent_site[:plan_type].to_sym] %>
         <% else %>