diff --git a/openecomp-ui/resources/scss/components/_activityLog.scss b/openecomp-ui/resources/scss/components/_activityLog.scss
index 9ada804..5e9418e 100644
--- a/openecomp-ui/resources/scss/components/_activityLog.scss
+++ b/openecomp-ui/resources/scss/components/_activityLog.scss
@@ -39,11 +39,7 @@
 	.svg-icon-wrapper {
 	  float: right;
 	}
-	.checkCircle {
-	  fill: $green;
-	  width: 16px;
-	  height: 16px;
-	}
+
 	.status-icon.false:after {
 	  @include status-icon-class;
 	  float: right;
diff --git a/openecomp-ui/resources/scss/components/_expandableInput.scss b/openecomp-ui/resources/scss/components/_expandableInput.scss
index 52b72d7..2484a73 100644
--- a/openecomp-ui/resources/scss/components/_expandableInput.scss
+++ b/openecomp-ui/resources/scss/components/_expandableInput.scss
@@ -1,24 +1,21 @@
 .expandable-input-top {
 	display: flex;
 	height: 22px;
-	.svg-icon-wrapper {
-		height: 17px;
-		width: 17px;
-	}
 	.expandable-input-wrapper {
 		display: flex;
-		.svg-icon.search {
-			height: 17px;
-			width: 17px;
-		}
 		&.closed {
-			.svg-icon.search {
-				transition: fill 0.5s ease-in;
-				fill: $blue;
-				cursor: pointer;
-				&:hover {
+			.svg-icon
+			{
+				&.__search {
+					height: 17px;
+					width: 17px;
 					transition: fill 0.5s ease-in;
-					fill: $dark-blue;
+					fill: $blue;
+					cursor: pointer;
+					&:hover {
+						transition: fill 0.5s ease-in;
+						fill: $dark-blue;
+					}
 				}
 			}
 		}
@@ -26,17 +23,21 @@
 			.svg-icon-wrapper {
 				margin-left: 3px;
 			}
-			.svg-icon.search {
-				fill: $dark-blue;
+			.svg-icon {
+				&.__search {
+					height: 17px;
+					width: 17px;
+					fill: $dark-blue;
+				}
 			}
-			.svg-icon.close {
-				margin-left: 7px;
-				height: 10px;
-				width: 10px;
-				opacity: 0.6;
-				fill: $dark-gray;
-				&:hover {
-					opacity: 1;
+			.svg-icon {
+				&.__close {
+					margin-left: 7px;
+					opacity: 0.6;
+					fill: $dark-gray;
+					&:hover {
+						opacity: 1;
+					}
 				}
 			}
 		}
diff --git a/openecomp-ui/resources/scss/components/_selectActionTable.scss b/openecomp-ui/resources/scss/components/_selectActionTable.scss
index 79a5432..fa8eb31 100644
--- a/openecomp-ui/resources/scss/components/_selectActionTable.scss
+++ b/openecomp-ui/resources/scss/components/_selectActionTable.scss
@@ -1,15 +1,13 @@
 .select-action-table-view {
 	.svg-icon-wrapper {
 		flex-direction: row;
-
-		&::before {
-			content:"";
-		}
 		.svg-icon {
-			margin-left: 5px;
-			margin-right: 5px;
-			width:16px;
-			height:16px;
+			&:not(.__plus) {
+				margin-left: 5px;
+				margin-right: 5px;
+				width:16px;
+				height:16px;
+			}
 		}
 	}
 	.dummy-icon {
@@ -57,21 +55,6 @@
 			display: flex;
 			flex-direction: row;
     		margin-bottom: 14px;
-			.svg-icon-wrapper.trashO {
-				.svg-icon {
-				  fill: $dark-gray;
-				}
-			}
-		  	.svg-icon-wrapper.errorCircle {
-			  .svg-icon {
-				fill: $red;
-			  }
-			}
-		  	.svg-icon-wrapper.checkCircle {
-			  .svg-icon {
-				fill: $green;
-			  }
-			}
 			.svg-icon-wrapper.hideDelete {
 				.svg-icon {
 					fill: $white;
diff --git a/openecomp-ui/resources/scss/components/_submitErrorResponse.scss b/openecomp-ui/resources/scss/components/_submitErrorResponse.scss
index b917dfe..f045038 100644
--- a/openecomp-ui/resources/scss/components/_submitErrorResponse.scss
+++ b/openecomp-ui/resources/scss/components/_submitErrorResponse.scss
@@ -26,14 +26,19 @@
       background-color: $tlv-gray;
       padding: 5px;
       cursor: pointer;
-      .chevronDown {
-        width:10px;
-        height:10px;
-        margin-right: 10px;
-        &.right {
-          transform: rotate(270deg);
+      .svg-icon {
+        &.__chevronDown {
+          margin-right: 10px;
         }
       }
+      .collapse-right {
+        .svg-icon {
+          &.__chevronDown {
+              transform: rotate(270deg);
+          }
+        }
+
+      }
 
     }
     .error-code-list-item {
diff --git a/openecomp-ui/resources/scss/components/_validationForm.scss b/openecomp-ui/resources/scss/components/_validationForm.scss
index e4aac32..e1adb56 100644
--- a/openecomp-ui/resources/scss/components/_validationForm.scss
+++ b/openecomp-ui/resources/scss/components/_validationForm.scss
@@ -75,7 +75,7 @@
           flex: 0.2;
           content: ' ';
         }
-        @media (min-width: 1349px) {
+        @media (min-width: 1389px) {
           &.add-line-break {
             .control-label {
               &:after {
diff --git a/openecomp-ui/resources/scss/components/_versionController.scss b/openecomp-ui/resources/scss/components/_versionController.scss
index b454d34..5761098 100644
--- a/openecomp-ui/resources/scss/components/_versionController.scss
+++ b/openecomp-ui/resources/scss/components/_versionController.scss
@@ -59,56 +59,33 @@
           margin-right: 20px;
           padding-bottom: 5px;
 
-          .versionControllerLockClosed {
+
+          .svg-icon {
             fill: $dark-gray;
-            width: 21px;
-            height: 23px;
-            margin-top: -3px;
-            &.disabled {
-              fill: $light-gray;
-            }
             &:hover {
               fill: $black;
             }
-          }
-          .versionControllerLockOpen {
-            fill: $dark-gray;
-            width: 24px;
-            height: 28px;
-            margin-top: -6px;
-            &:hover {
-              fill: $black;
+            &.__versionControllerLockClosed {
+              margin-top: -3px;
+            }
+            &.__versionControllerLockOpen {
+              margin-top: -6px;
+            }
+            &.__versionControllerSubmit {
+              fill: $blue;
+              &:hover {
+                fill: $dark-blue;
+              }
+              &.disabled {
+                fill: $dark-gray;
+              }
             }
           }
-          .versionControllerSubmit {
-            fill: $blue;
-            &.disabled {
-              fill: $light-gray;
-            }
-            &:hover {
-              fill: $dark-blue;
-            }
           }
 
-          .versionControllerRevert {
-            fill: $dark-gray;
-            &.disabled {
-              fill: $light-gray;
-            }
-            &:hover {
-              fill: $black;
-            }
-          }
-          .versionControllerSave {
-            fill: $dark-gray;
-            &.disabled {
-              fill: $light-gray;
-            }
-            &:hover {
-              fill: $black;
-            }
-          }
-        }
+
+
+
       }
       .vc-nav-item-close {
         display: flex;