diff --git a/admin/survey/classes/class.NewSurvey.php b/admin/survey/classes/class.NewSurvey.php
index 15af2e395..4020e595c 100644
--- a/admin/survey/classes/class.NewSurvey.php
+++ b/admin/survey/classes/class.NewSurvey.php
@@ -65,7 +65,7 @@ class NewSurvey{
 			if($this->subpage == 'template'){
 				echo '<ul class="template_type_menu">';		
 				for($i=0; $i<=10; $i++){
-					echo '<li><a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template&c='.$i.'" title="'.$lang['srv_newSurvey_survey_template_cat'.$i].'"><span class="subitem '.($this->subpage == 'template' && $this->template_category == $i ? ' active' : '').'"><span class="faicon fa-file-image new_survey_menu_icon">'.$lang['srv_newSurvey_survey_template_cat'.$i].'</span></a></li>';
+					echo '<li><a class="noline" href="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template&c='.$i.'" title="'.$lang['srv_newSurvey_survey_template_cat'.$i].'"><span class="subitem '.($this->subpage == 'template' && $this->template_category == $i ? ' active' : '').'">'.$lang['srv_newSurvey_survey_template_cat'.$i].'</a></li>';
 				}
 				echo '</ul>';
 			}
@@ -333,7 +333,7 @@ class NewSurvey{
 		// 2. sklop - izbira predloge
         echo '<div class="fieldset noSurvey_template">';
 
-        echo '<div class="title">' . $lang['srv_newSurvey_survey_template_cat'.$this->template_category] . '</div>';
+        echo '<div class="title">' . $lang['srv_newSurvey_survey_template_choose'] . '</div>';
 		
 		echo '<input type="hidden" name="noSurvey_template_id" id="noSurvey_template_id" value="">';
 
@@ -343,22 +343,24 @@ class NewSurvey{
             echo '<option value="'.$site_url.'admin/survey/index.php?a=ustvari_anketo&b=template&c='.$i.'" '.($this->subpage == 'template' && $this->template_category == $i ? ' selected="selected"' : '').'>'.$lang['srv_newSurvey_survey_template_cat'.$i].'</option>';
         }
         echo '</select>';
-			
+        
+		echo '<div class="noSurvey_template_wrap">';
+		echo '<div class="noSurvey_template_holder">';
 		// Prikaz predlog
 		foreach($this->templates as $template_id => $template_name){				
 			$this->displayRightContentTemplate($template_id);
 		}
+        echo '</div>';
+        echo '</div>';
 		
         echo '</div>';
 
 		
 		// Gumba naprej in preklici
-        echo '<div class="noSurvey_buttons">';
-
-        echo '<a href="' . $site_url . 'admin/survey/index.php" title="' . $lang['srv_cancel'] . '"><span id="noSurvey_cancel">' . $lang['srv_cancel'] . '</span></a>';
-        echo '<a href="#" onclick="newAnketaTemplate();" title="' . $lang['srv_create_survey'] . '"><span id="noSurvey_create">' . $lang['next1'] . '</span></a>';
-
-        echo '</div>';
+		echo '<div class="button_holder">';
+		echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';				
+		echo '<button class="medium blue" onclick="newAnketaTemplate();" id="noSurvey_create" title="' . $lang['srv_create_survey']. '">'.$lang['next1'].'</button>';
+		echo '</div>';
 	}
 	
 	// Pripravimo podatke o vseh predlogah na trenutni strani
@@ -406,24 +408,19 @@ class NewSurvey{
 		
 
 		// Vsebina
+		echo '<div class="template_title">'.$template_data['naslov'].'</div>';
 		echo '<div class="template_content">';
-		echo '<div class="template_content_white">';
-		echo $lang['srv_newSurvey_survey_template_type'].': <span class="bold">'.$template_data['tip'].'</span>';
-		echo '<br /><br /><br />';
 		if($template_data['opis'] != '')
-			echo (strlen($template_data['opis']) > 155) ? substr($template_data['opis'], 0, 152).'...' : $template_data['opis'];
+			echo (strlen($template_data['opis']) > 140) ? substr($template_data['opis'], 0, 137).'...' : $template_data['opis'];
 		else
 			echo $template_data['naslov'];
-
-		echo '</div>';
-		
-		echo '<span class="template_title">'.$template_data['naslov'].'</span>';
-		
-		echo '</div>';
+			echo '</div>';
 
 		// Predogled
-		echo '<a href="'.$site_url.'a/'.$template_id.'?preview=on&no_preview=1&size=full" target="_blank" class="template_preview"><span class="faicon preview"></span> '.$lang['srv_newSurvey_survey_template_preview'].'</a>';
-
+		echo '<div class="template_preview">';
+		echo '<a class="noline" href="'.$site_url.'a/'.$template_id.'?preview=on&no_preview=1&size=full" target="_blank"><span class="faicon preview"></span> '.$lang['srv_newSurvey_survey_template_preview'].'</a>';
+		echo '</div>';
+		
 		echo '</div>';
 	}
 	
@@ -467,7 +464,6 @@ class NewSurvey{
 		echo '<button class="medium white-blue" onClick="window.location=\''.$site_url . 'admin/survey/index.php\';return false;" id="noSurvey_cancel">'.$lang['srv_cancel'].'</button>';				
 		echo '<button class="medium blue" onclick="newAnketaCopy();" id="noSurvey_create">'.$lang['next1'].'</button>';
 		echo '</div>';
-        echo '<div class="noSurvey_buttons">';
 	}
 	
 	// Vsebina za uvažanje ankete iz arhiva
diff --git a/lang/1.php b/lang/1.php
index 30fde85c8..a4c544cb5 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -7045,6 +7045,7 @@ $lang = array (
 	'srv_newSurvey_survey_template2'	    => "Ustvari anketo iz predloge",
 	'srv_newSurvey_survey_template_type'	=> "Tip ankete",
 	'srv_newSurvey_survey_template_preview'	=> "Predogled",
+	'srv_newSurvey_survey_template_choose'	=> "Izberi predlogo",
 	'srv_newSurvey_survey_template_cat0'	=> "Vse predloge",
 	'srv_newSurvey_survey_template_cat1'	=> "Evalvacija spletne strani",
 	'srv_newSurvey_survey_template_cat2'	=> "Izobraževanje",
diff --git a/lang/2.php b/lang/2.php
index b6f5593a4..222fd1c14 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6931,6 +6931,7 @@ $lang = array (
 	'srv_newSurvey_survey_template2'	    => "Create survey from template",
 	'srv_newSurvey_survey_template_preview'	=> "Preview",
 	'srv_newSurvey_survey_template_type'	=> "Survey type",
+	'srv_newSurvey_survey_template_choose'	=> "Choose a template",
 	'srv_newSurvey_survey_template_cat0'	=> "All templates",
 	'srv_newSurvey_survey_template_cat1'	=> "Evaluation of websites",
 	'srv_newSurvey_survey_template_cat2'	=> "Education",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 3f9996a0e..6399dda28 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -13895,10 +13895,6 @@ and open the template in the editor.
     Author     : podkrizniku
 */
 div#main.hide_header {
-  position: absolute;
-  height: 100vh;
-  width: 100vw;
-  background-color: #FFFFFF;
   padding: 0 !important;
 }
 
@@ -13948,21 +13944,25 @@ div#main.hide_header {
 }
 #new_anketa_div .layout_left_item ul {
   list-style-type: none;
-  padding-left: 30px;
-  margin: 25px 0 15px 0;
+  padding-left: 70px;
+  margin: 16px 0;
 }
 #new_anketa_div .layout_left_item ul li {
-  padding: 0 0 10px 0;
+  margin-bottom: 3px;
+}
+#new_anketa_div .layout_left_item ul li:last-of-type {
+  margin-bottom: 0px;
 }
 #new_anketa_div .layout_left_item ul li a {
   font-size: 14px;
-  color: #777777;
+  color: #333333;
 }
 #new_anketa_div .layout_left_item ul li a:hover {
   color: #1E88E5;
 }
 #new_anketa_div .layout_left_item ul li .active {
   color: #1E88E5;
+  font-weight: 600;
 }
 
 /*
@@ -13985,6 +13985,7 @@ and open the template in the editor.
 }
 #new_anketa_div .layout_right_item .layout_right_centering {
   max-width: 1060px;
+  box-sizing: border-box;
 }
 #new_anketa_div .layout_right_item .layout_right_centering span.faicon.fa-times {
   position: absolute;
@@ -14274,60 +14275,57 @@ and open the template in the editor.
   background-color: #1E88E5;
   color: white !important;
 }
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template {
-  overflow: auto;
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap {
+  display: flex;
+  justify-content: center;
 }
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template {
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+  width: 90%;
+}
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template {
   cursor: pointer;
-  float: left;
-  margin: 0 30px 30px 20px;
-  width: 200px;
+  margin-bottom: 32px;
+  border: solid 1px #E5E5E5;
+  width: 292px;
+  height: 205px;
+  transition: 0.1s;
 }
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template:hover {
-  color: #777777;
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template:hover {
+  background-color: #fafafa;
 }
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_content {
-  overflow: hidden;
-  width: 200px;
-  height: 189px;
-  margin: 0 10px;
-  padding: 5px 5px 5px 5px;
-  background-color: #1E88E5;
-  border: none;
-  /*border-radius: 3px;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;*/
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template:hover .template_title {
+  background-color: #f0f0f0;
 }
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_content:hover {
-  background-color: #187bd1;
-  border: none;
-}
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_content .template_content_white {
-  width: 190px;
-  height: 120px;
-  padding: 15px 5px;
-  text-align: center;
-  font-size: 12px;
-  font-weight: 400;
-  background-color: white;
-}
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_content .template_title {
-  font-size: 13px;
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template .template_title {
+  font-weight: 900;
   text-transform: uppercase;
+  background-color: #F8F8F8;
+  padding: 19px 11px 19px;
 }
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template .template_preview {
-  margin-right: -15px;
-  float: right;
-  padding: 5px 0 5px 5px;
-  font-size: 12px;
-  font-weight: 400;
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template .template_content {
+  overflow: hidden;
+  margin: 16px 11px;
 }
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template.selected {
-  color: #777777;
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template .template_preview {
+  bottom: 0;
+  margin: 0 11px;
 }
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .template.selected .template_content {
-  background-color: #FF0000;
-  border: none;
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected {
+  cursor: pointer;
+  border-color: #808080;
+  background-color: #C4C4C4;
+}
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected .template_title {
+  background-color: #808080;
+  color: #FFFFFF;
+}
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected .template_preview a {
+  color: #FFFFFF;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template select.template_type_menu {
   display: none;
diff --git a/resources/sass/admin_new/pages/new_survey_page/left_menu.scss b/resources/sass/admin_new/pages/new_survey_page/left_menu.scss
index 9a2b52dd9..5817fad2c 100644
--- a/resources/sass/admin_new/pages/new_survey_page/left_menu.scss
+++ b/resources/sass/admin_new/pages/new_survey_page/left_menu.scss
@@ -18,7 +18,7 @@
     	box-shadow: none;
     
     
-    height: fit-content;
+    	height: fit-content;
 
 		.item {
 			display: flex;
@@ -51,19 +51,25 @@
 		
 		ul{
 			list-style-type: none;
-			padding-left: 30px;
-			margin: 25px 0 15px 0;
+			padding-left: 70px;
+			margin: 16px 0;
 			li{
-				padding: 0 0 10px 0;				
+
+				margin-bottom: 3px;
+				&:last-of-type {
+					margin-bottom: 0px;
+				}
+
 				a{
 					font-size: 14px;
-					color: $very-dark-gray;
+					color: $black;
 					&:hover{
 						color: $blue;
 					}
 				}
 				.active{
 					color: $blue;
+					font-weight: $semi-bold;
 				}
 			}
 		}		
diff --git a/resources/sass/admin_new/pages/new_survey_page/new_survey_page.scss b/resources/sass/admin_new/pages/new_survey_page/new_survey_page.scss
index 11c513135..78f85c080 100644
--- a/resources/sass/admin_new/pages/new_survey_page/new_survey_page.scss
+++ b/resources/sass/admin_new/pages/new_survey_page/new_survey_page.scss
@@ -9,10 +9,6 @@ and open the template in the editor.
 */
 
 div#main.hide_header {
-    position: absolute;
-    height: 100vh;
-    width: 100vw;
-    background-color: $white;
     padding: 0 !important;
 }
 
diff --git a/resources/sass/admin_new/pages/new_survey_page/right_content.scss b/resources/sass/admin_new/pages/new_survey_page/right_content.scss
index 1e5d0ee4c..d74bf180a 100644
--- a/resources/sass/admin_new/pages/new_survey_page/right_content.scss
+++ b/resources/sass/admin_new/pages/new_survey_page/right_content.scss
@@ -30,6 +30,7 @@ $skin_selector: $red;
 
 		.layout_right_centering {
 			max-width: 1060px;
+			box-sizing: border-box;
 
 			span.faicon.fa-times {
 				position: absolute;
@@ -393,67 +394,72 @@ $skin_selector: $red;
 				}
 			}
 			.noSurvey_template {
-				overflow: auto;
 
-				.template {
-					cursor: pointer;
-					float: left;
-					margin: 0 30px 30px 20px;
-					width: 200px;
-					&:hover {
-						color: $selectors;
-					}
-					
-					.template_content {
-						overflow: hidden;
-						
-						width: 200px;
-						height: 189px;
-						margin: 0 10px;
-						padding: 5px 5px 5px 5px;
-						
-						background-color: $default_template_background;
-						border: none;
-						/*border-radius: 3px;
-						-moz-border-radius: 3px;
-						-webkit-border-radius: 3px;*/
-						
-						&:hover {
-							background-color: darken( $default_template_background, 5% );
-							border: none;
+				.noSurvey_template_wrap {
+					display: flex;
+					justify-content: center;
+
+					.noSurvey_template_holder {
+						display: flex;
+						flex-direction: row;
+						justify-content: space-between;
+						flex-wrap: wrap;
+						box-sizing: border-box;
+						width: 90%;
+
+						.template {
+							cursor: pointer;
+							margin-bottom: 32px;
+							border: solid 1px $gray;
+							width: 292px;
+							height: 205px;
+
+							transition: 0.1s;
+
+							&:hover {
+								background-color: darken($white,2%);
+								.template_title{
+									background-color: darken($light-gray,3%);
+								}
+							}
+
+							.template_title{
+								font-weight: $heavy;
+								text-transform: uppercase;
+
+								background-color: $light-gray;
+								padding: 19px 11px 19px;
+
+							}
+							
+							.template_content {
+								overflow: hidden;
+								margin: 16px 11px;
+							}
+
+							.template_preview {
+								bottom: 0;
+								margin: 0 11px;
+							}
+
+							&.selected {
+								cursor: pointer;
+								border-color: $very-dark-gray2;
+								background-color: $dark-gray;
+
+								.template_title{
+									background-color: $very-dark-gray2;
+									color: $white;
+								}
+
+								.template_preview {
+									a {
+										color: $white;
+									}
+								}
+							}
 						}
 						
-						.template_content_white {
-							width: 190px;
-							height: 120px;
-							padding: 15px 5px;
-							text-align: center;
-							font-size: 12px;
-							font-weight: 400;
-							background-color: $white_template_background;
-						}
-						
-						.template_title{
-							font-size: 13px;
-							text-transform: uppercase;
-						}
-					}
-					
-					.template_preview{
-						margin-right: -15px;
-						float: right;
-						padding: 5px 0 5px 5px;
-						
-						font-size: 12px;
-						font-weight: 400;
-					}
-				}
-				.template.selected {
-					color: $selectors;
-					
-					.template_content {
-						background-color: $skin_selector;
-						border: none;
 					}
 				}