diff --git a/framework/yii/gii/generators/crud/templates/views/_form.php b/framework/yii/gii/generators/crud/templates/views/_form.php
index 2d9d5dc..529d3ef 100644
--- a/framework/yii/gii/generators/crud/templates/views/_form.php
+++ b/framework/yii/gii/generators/crud/templates/views/_form.php
@@ -36,7 +36,7 @@ use yii\widgets\ActiveForm;
 	echo "\t\t<?php echo " . $generator->generateActiveField($attribute) . " ?>\n\n";
 } ?>
 		<div class="form-group">
-			<?php echo '<?php'; ?> echo Html::submitButton($model->isNewRecord ? 'Create' : 'Update', array('class' => 'btn btn-primary')); ?>
+			<?php echo '<?php'; ?> echo Html::submitButton($model->isNewRecord ? 'Create' : 'Update', array('class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary')); ?>
 		</div>
 
 	<?php echo '<?php'; ?> ActiveForm::end(); ?>
diff --git a/framework/yii/gii/views/default/view.php b/framework/yii/gii/views/default/view.php
index 9754918..91c6bcb 100644
--- a/framework/yii/gii/views/default/view.php
+++ b/framework/yii/gii/views/default/view.php
@@ -45,10 +45,10 @@ foreach ($generator->templates as $name => $path) {
 						Please select which set of the templates should be used to generated the code.
 				'); ?>
 				<div class="form-group">
-					<?php echo Html::submitButton('Preview', array('name' => 'preview', 'class' => 'btn btn-success')); ?>
+					<?php echo Html::submitButton('Preview', array('name' => 'preview', 'class' => 'btn btn-primary')); ?>
 
 					<?php if(isset($files)): ?>
-						<?php echo Html::submitButton('Generate', array('name' => 'generate', 'class' => 'btn btn-danger')); ?>
+						<?php echo Html::submitButton('Generate', array('name' => 'generate', 'class' => 'btn btn-success')); ?>
 					<?php endif; ?>
 				</div>
 			</div>