diff --git a/app/configuration/styles/date-time.scss b/app/configuration/styles/date-time.scss
index 80d4b17..00f7b8b 100644
--- a/app/configuration/styles/date-time.scss
+++ b/app/configuration/styles/date-time.scss
@@ -1,10 +1,6 @@
 // Date Time SCSS
 .time__form {
 
-  input {
-    margin-bottom: 0em;
-  }
-
   fieldset {
     padding-left: 1.8em;
   }
@@ -49,12 +45,7 @@
       margin: .5em;
     }
   }
-  .date-time__dns-remove {
-    color: $medblue;
-    opacity: 1;
-    margin-left: 1em;
-    &:hover {
-      cursor: pointer;
-    }
+  /*button*/.date-time__dns-remove {
+    margin-right: 1em;
   }
 }
diff --git a/app/configuration/styles/firmware.scss b/app/configuration/styles/firmware.scss
index 6d3c00f..8c7a304 100644
--- a/app/configuration/styles/firmware.scss
+++ b/app/configuration/styles/firmware.scss
@@ -15,6 +15,7 @@
     }
     .icon {
       color: $medblue;
+      fill: $medblue;
       &.disabled {
         color: $medgrey;
         &:hover {
@@ -27,7 +28,6 @@
     }
     .icon.icon-as-spacer {
       text-indent: 0;
-      color: $btn__disabled-txt;
       &:hover {
         cursor: default;
       }
@@ -116,7 +116,7 @@
     padding-left: 1em;
     padding-right: 1em;
     margin-bottom: 1em;
-  .button {
+  .btn {
     margin: 1em .5em 1em 0;
     min-width: 3em;
   }
@@ -138,7 +138,7 @@
   padding-left: 1em;
   padding-bottom: 50px;
   padding-right: 0;
-  .button {
+  .btn {
     margin-top: 15px;
   }
 }
diff --git a/app/configuration/styles/network.scss b/app/configuration/styles/network.scss
index 61a6cb6..5b862e7 100644
--- a/app/configuration/styles/network.scss
+++ b/app/configuration/styles/network.scss
@@ -11,12 +11,10 @@
     text-align: left;
   }
   input {
-    margin-bottom: 1.2em;
+    margin-bottom: 2em;
   }
 
   .net-config__fieldset {
-    margin-bottom: 1.2rem;
-
     legend {
       padding-bottom: 0.5rem;
     }
@@ -41,10 +39,13 @@
     font-weight: 700;
   }
   .network-config__submit-wrapper {
-    width: 100%;
-    margin-top: 3em;
     padding-top: 1em;
     border-top: 1px solid $medgrey;
+    margin-top: 2em;
+
+    .btn:not(:last-child) {
+      margin-right: 1em;
+    }
 
     &::after {
       content: " ";
@@ -52,20 +53,8 @@
       clear: both;
     }
 
-    button {
-      float: right;
-      margin: .5em;
-    }
   }
   .network-config__ipv4-wrap {
     padding-bottom: 1.8em;
   }
-  .network-config_remove-button {
-    color: $medblue;
-    margin-left: 1em;
-    opacity: 1;
-    &:hover {
-      cursor: pointer;
-    }
-  }
 }
diff --git a/app/configuration/styles/snmp.scss b/app/configuration/styles/snmp.scss
index ea20a6a..96b71f0 100644
--- a/app/configuration/styles/snmp.scss
+++ b/app/configuration/styles/snmp.scss
@@ -66,36 +66,17 @@
   }
   .snmp__buttons {
     text-align: right;
-    padding-right: .5em;
-    &.trash{
-      text-align: left;
-    }
-    button{
-      margin:.3em;
-      img{
-        width: 100%;
-        height:100%;
+    .btn{
+      padding: 0;
+      width: auto;
+      svg {
+        fill: $color--blue-40;
+        width: auto;
+        height: 1.3em;
       }
     }
   }
-  .trash_button {
-    padding: 0;
-    width: 1.3em;
-    height: 1.3em;
-  }
-  .edit_button {
-    padding: 0;
-    width: 1.3em;
-    height: 1.2em;
-  }
-  .btn-add {
-    &:focus {
-      outline-offset: 3px;
-    }
-    margin: 2em 0;
-    color: $primebtn__bg;
-    padding: 1em 0;
-  }
+
   .snmp__submit-wrapper {
     width: 100%;
     border-top: 1px solid $medgrey;
diff --git a/app/configuration/styles/virtual-media.scss b/app/configuration/styles/virtual-media.scss
index f7d75b8..1e7724b 100644
--- a/app/configuration/styles/virtual-media.scss
+++ b/app/configuration/styles/virtual-media.scss
@@ -26,9 +26,6 @@
   font-size: 1rem;
   background-color: $white;
   min-width: 3em;
-  &.disabled {
-    background-color: $btn__disabled-bg;
-  }
 }
 
 .vm__upload-content {
@@ -40,8 +37,7 @@
     cursor: pointer;
     width: 0.75em;
     height: 0.75em;
-    margin: 0.3em 1em 0.3em 0.3em;
-    background-image: url(../assets/images/crit-x-black.svg);
+    margin: 0 1em 0.3em 0.3em;
   }
 }