diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index fa5701ebf..e2e2bbb49 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20939,12 +20939,12 @@ div.page_tema div.theme_list {
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  padding: 6px 16px;
+  padding: 10px 16px;
   margin-bottom: 16px;
   background-color: #FFFFFF;
   border: 1px solid #E5E5E5;
   box-sizing: border-box;
-  border-radius: 4px;
+  border-radius: 2px;
 }
 div.page_tema div.theme_list:last-of-type {
   margin-bottom: 0;
@@ -20971,22 +20971,26 @@ div.page_tema div.theme_list div.options div.buttons-window {
   bottom: 20px;
   max-width: 113px;
   filter: drop-shadow(2px 2px 2px rgba(0, 0, 0, 0.25));
+  border-radius: 2px;
   margin-right: 5px;
   background-color: white;
 }
 div.page_tema div.theme_list div.options div.buttons-window .button {
   border: none;
-  margin: 8px auto 8px auto;
+  margin: 8px 0px;
+  padding: 0px 16px;
   text-align: center;
 }
-div.page_tema div.theme_list div.options div.buttons-window .button .fa-hand-pointer {
-  margin-right: 12px;
-}
-div.page_tema div.theme_list div.options div.buttons-window .button .trash {
-  margin-right: 12px;
-}
 div.page_tema div.theme_list div.options div.buttons-window .button .faicon {
   vertical-align: middle;
+  width: 14px;
+  height: 14px;
+}
+div.page_tema div.theme_list div.options div.buttons-window .button:first-of-type {
+  margin-top: 16px;
+}
+div.page_tema div.theme_list div.options div.buttons-window .button:last-of-type {
+  margin-bottom: 16px;
 }
 div.page_tema div.theme_list div.options div.buttons-window.active {
   display: block;
@@ -21010,7 +21014,7 @@ div.page_tema div.theme_list div.options div.button:last-child {
   margin-right: 0px;
 }
 div.page_tema div.theme_list div.options div.button span.faicon {
-  margin-right: 8px;
+  margin-right: 10px;
   color: #1E88E5;
 }
 div.page_tema div.theme_list div.options div.button:hover {
@@ -21077,7 +21081,6 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
 }
 div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_content span.theme_name {
   font-weight: 600;
-  font-family: "Roboto";
   font-weight: 500;
 }
 div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options {
@@ -21090,7 +21093,6 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
 div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options span.theme_name {
   font-weight: 500;
   text-transform: uppercase;
-  font-family: "Roboto";
   font-size: 14px;
   display: flex;
   align-items: center;
@@ -21259,7 +21261,7 @@ div#theme-edit-wrap div#theme-editor #picker {
   left: 500px;
   z-index: 999;
   border-radius: 2px;
-  box-shadow: 0px 0px 5px 0px #C4C4C4;
+  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
 }
 div#theme-edit-wrap div#theme-editor #picker .popup_close {
   position: absolute !important;
diff --git a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
index b7896880f..44b546dea 100644
--- a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
+++ b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
@@ -32,7 +32,7 @@ div.page_tema {
         justify-content: space-between;
 
         width: 100%;
-        padding: 6px 16px;
+        padding: 10px 16px;
         margin-bottom: 16px;
         &:last-of-type {
             margin-bottom: 0;
@@ -41,7 +41,7 @@ div.page_tema {
         background-color: $white;
         border: 1px solid $gray;
         box-sizing: border-box;
-        border-radius: 4px;
+        border-radius: 2px;
         
         &.active_theme {
             background-color: $light-gray;
@@ -77,6 +77,7 @@ div.page_tema {
                 max-width: 113px;
                 // display: none;
                 filter: drop-shadow(2px 2px 2px rgba(0, 0, 0, 0.25));
+                border-radius: 2px;
 
 
                 margin-right: 5px;
@@ -89,28 +90,24 @@ div.page_tema {
                 .button{
                     border: none;
 
-                    margin: 8px auto 8px auto;
-
-                    // margin: 5px 0px;
+                    // margin: 8px auto 8px auto;
+                    margin: 8px 0px;
+                    padding: 0px 16px;
 
                     text-align: center;
 
-                    .fa-hand-pointer{
-                        margin-right: 12px;
-                    }
-                    .trash{
-                        margin-right: 12px;
-                    }
 
                     .faicon{
                         vertical-align: middle;
+                        width: 14px;
+                        height: 14px;
                     }
                 }
                 .button:first-of-type{
-                    // padding-top: 16px;
+                    margin-top: 16px;
                 }
                 .button:last-of-type{
-                    // padding-bottom: 16px;
+                    margin-bottom: 16px;
                 }
 
 
@@ -143,7 +140,7 @@ div.page_tema {
                 cursor: pointer;
 
                 span.faicon {
-                    margin-right: 8px;
+                    margin-right: 10px;
                     color: $blue;
                 }
 
@@ -224,7 +221,7 @@ div.page_tema {
     
                     span.theme_name {
                         font-weight: $semi-bold;
-                        font-family: 'Roboto';
+                        // font-family: 'Roboto';
 
                         font-weight: 500;
 
@@ -242,7 +239,7 @@ div.page_tema {
                     span.theme_name {
                         font-weight: 500;
                         text-transform: uppercase;
-                        font-family: 'Roboto';
+                        // font-family: 'Roboto';
                         font-size: 14px;
 
                         display: flex;
@@ -464,7 +461,7 @@ div#theme-edit-wrap{
             left: 500px;
             z-index: 999;
             border-radius: 2px;
-            box-shadow: 0px 0px 5px 0px $dark-gray;
+            box-shadow: 0px 0px 7px 0px #0000001F;
         }
 
         div.button_holder {