diff --git a/static/caen/_custom.scss b/static/caen/_custom.scss
index f102c33c..18a6ab99 100644
--- a/static/caen/_custom.scss
+++ b/static/caen/_custom.scss
@@ -94,20 +94,18 @@ label {
 }
 
 %cancel-button {
-	&, &:hover {
-		padding: 1.1em 2em 1em;
-		background-color: #fff;
-		color: black;
-		border-color: $gray;
-	}
+	--background: #fff;
+	--color: black;
+	padding: 1.1em 2em 1em;
+	border-color: $gray;
 }
 
 %orange-button {
-	@extend %cancel-button;
-	&, &:hover {
-		background-color: $orange !important;
-		border-color: $orange;
-	}
+	padding: 1.1em 2em 1em;
+	--color: black;
+	--background: #{$orange};
+	--hover-background: #{$orange};
+	border-color: $orange;
 }
 	
 //
@@ -492,7 +490,7 @@ $topmessage-alt :
 	}
 }
 
-div.tracking-code-input-cell {
+.gru-content div.tracking-code-input-cell {
 	@extend .cell-with-dash;
 	@extend .cell-blue;
 	p {
@@ -507,20 +505,20 @@ div.tracking-code-input-cell {
 		display: flex;
 		flex-wrap: wrap;
 		align-items: stretch;
-	}
-	input.tracking-code--input {
-		flex: 1 1 0;
-		margin: 0;
-		min-width: 8em;
-	}
-	button {
-		margin-right: 0;
-		border-radius: 3px;
-		margin-left: 0.25em;
-		&:hover {
-			background: $orange;
-			color: black;
-			box-shadow: none;
+		input.tracking-code--input {
+			flex: 1 1 0;
+			margin: 0;
+			min-width: 8em;
+		}
+		button {
+			@extend %button;
+			--hover-background: #{$orange};
+			margin-right: 0;
+			border-radius: 3px;
+			margin-left: 0.25em;
+			&:hover {
+				box-shadow: none;
+			}
 		}
 	}
 	&.cell h2 + div {
@@ -619,10 +617,6 @@ div#rub_service {
 	}
 }
 
-div.gru-content .submit-button button,
-div.gru-content button.submit-button  {
-	@extend %orange-button;
-}
 div.gru-content .previous-button button {
 	@extend %cancel-button;
 }
diff --git a/static/caen/_vars.scss b/static/caen/_vars.scss
index 534401b2..50c2d6c9 100644
--- a/static/caen/_vars.scss
+++ b/static/caen/_vars.scss
@@ -68,6 +68,7 @@ $button-background: black;
 $buttons-order: cancel (grow), previous, submit;
 $button-hover-color: black;
 $button-hover-background: white;
+$submit-button-style: "%orange-button";
 
 $form-sidebar-gutter: $columns-gutter;
 $form-sidebar-width: 25.5%;