3 files changed, 15 insertions, 15 deletions
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 0c8c37cb4..c73bbfe42 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -237,7 +237,7 @@ table.mceLayout {
 	float:right;
 	margin-left:14px;
 }
-.admin_area .submit-button {
+.admin_area .elgg-submit-button {
 	font-size: 14px;
 	font-weight: bold;
 	color: white;
@@ -257,7 +257,7 @@ table.mceLayout {
 	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
 	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
 }
-.admin_area .submit-button:hover {
+.admin_area .elgg-submit-button:hover {
 	color: white;
 	border-color: #333333;
 	text-decoration:none;
@@ -301,7 +301,7 @@ table.mceLayout {
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 }
-.admin_area .cancel-button {
+.admin_area .elgg-cancel-button {
 	font-size: 14px;
 	font-weight: bold;
 	text-decoration:none;
@@ -318,7 +318,7 @@ table.mceLayout {
 	margin:10px 0 10px 10px;
 	cursor: pointer;
 }
-.admin_area .cancel-button:hover {
+.admin_area .elgg-cancel-button:hover {
 	background-color: #999999;
 	background-position:  left 10px;
 	text-decoration:none;
@@ -546,7 +546,7 @@ table.mceLayout {
 	float: left;
 	width: 150px;
 }
-form.admin_plugins_simpleview .submit-button {
+form.admin_plugins_simpleview .elgg-submit-button {
 	margin-right:20px;
 }
 .plugin_info {
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 603a128b7..698d5fdf3 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -67,7 +67,7 @@ a.longtext-control {
 	float:right;
 	margin-left:14px;
 }
-.submit-button {
+.elgg-submit-button {
 	font-size: 14px;
 	font-weight: bold;
 	color: white;
@@ -87,7 +87,7 @@ a.longtext-control {
 	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
 	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
 }
-.submit-button:hover {
+.elgg-submit-button:hover {
 	color: white;
 	border-color: #0054a7;
 	text-decoration:none;
@@ -96,12 +96,12 @@ a.longtext-control {
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 }
-.submit-button.disabled {
+.elgg-submit-button.disabled {
 	background-color:#999999;
 	border-color:#999999;
 	color:#dedede;
 }
-.submit-button.disabled:hover {
+.elgg-submit-button.disabled:hover {
 	background-color:#999999;
 	border-color:#999999;
 	color:#dedede;
@@ -141,7 +141,7 @@ input[type="submit"]:hover {
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 }
-.cancel-button {
+.elgg-cancel-button {
 	font-size: 14px;
 	font-weight: bold;
 	text-decoration:none;
@@ -158,7 +158,7 @@ input[type="submit"]:hover {
 	margin:10px 0 10px 10px;
 	cursor: pointer;
 }
-.cancel-button:hover {
+.elgg-cancel-button:hover {
 	background-color: #999999;
 	background-position:  left 10px;
 	text-decoration:none;
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 16529004f..3eb7e93a0 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -371,7 +371,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
 	font-weight:normal;
 	font-size:100%;
 }
-.loginbox .submit-button {
+.loginbox .elgg-submit-button {
 	margin-right: 15px;
 }
 #login .persistent-login {
@@ -467,7 +467,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
 	font-weight:normal;
 	font-size: 100%;
 }
-#login-dropdown #signin-menu .submit-button {
+#login-dropdown #signin-menu .elgg-submit-button {
 	margin-right:15px;
 }
 
@@ -744,8 +744,8 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
 .friends-picker-navigation-r:hover {
 	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px -44px;
 }
-.friendspicker-savebuttons .submit-button,
-.friendspicker-savebuttons .cancel-button {
+.friendspicker-savebuttons .elgg-submit-button,
+.friendspicker-savebuttons .elgg-cancel-button {
 	margin:5px 20px 5px 5px;
 }
 #collectionMembersTable {