diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index b49245ec7..2aaed072c 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -143,12 +143,6 @@ class SurveyDiagnostics
 				$_pripombe = true;	
 			}
 		
-			
-		echo '<span class="srv_diagnostic_note">';
-		echo $this->printNote();
-		#
-		echo '</span>';
-		
 		
 		SurveySetting::getInstance()->Init($this->anketa);
 		$preview_disableif = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disableif');
@@ -158,27 +152,36 @@ class SurveyDiagnostics
 		$preview_hidecomment = SurveySetting::getInstance()->getSurveyMiscSetting('preview_hidecomment');
 		$preview_options = ''.($preview_disableif==1?'&disableif=1':'').($preview_disablealert==1?'&disablealert=1':'').($preview_displayifs==1?'&displayifs=1':'').($preview_displayvariables==1?'&displayvariables=1':'').($preview_hidecomment==1?'&hidecomment=1':'').'';
 		
+		/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TG
 		echo '<br><div style="display:inline-block; margin: 0 0 10px 20px">';
 		
-		/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TG
 		echo '<span class="tooltip">';
-		echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank" style="font-size:15px"><span class="faicon edit_square"></span> '.$lang['srv_survey_testdata'].'</a>';
-		echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') ';
 		echo '<span class="expanded-tooltip bottom light" style="left: -40px;">';
 		echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].'';
 		echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
 		echo '<span class="arrow"></span>';
 		echo '</span>';	// expanded-tooltip bottom
 		echo '</span>'; // tooltip */
-			
-		echo ' - <a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'"><span class="sprites settings"></span> '.$lang['srv_uredniske_nastavitve'].'</a>';
+
+		// TESTIRANJE
+		echo '<h2>'.$lang['srv_diagnostika_testiranje'].'</h2>';
+
+		echo '<p class="bottom16">'.$lang['srv_diagnostika_testiranje_notea'].'<a href="index.php?anketa=' . $this->anketa . '&a=testiranje&m=testnipodatki">'.$lang['srv_diagnostika_testiranje_noteb'].'</a>'.$lang['srv_diagnostika_testiranje_notec'].'</p>';
+
+		echo '<div class="button_holder inline center bottom0">';
+		echo '<span class="faicon link-chain link-right blue"></span><span class="italic">'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'</span>';
+		echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\');" return false;">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
 		echo '</div>';
+
+		/*Nastavitve testnega vnosa - popup	
+		echo ' - <a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'"><span class="sprites settings"></span> '.$lang['srv_uredniske_nastavitve'].'</a>';
 		
 		if ( isset($_GET['popup']) && $_GET['popup'] == 'open' ) {
 			?><script> $(function() { $('#popup-open').click(); }); </script><?php
-		}
-		
-		echo '<br/>';
+		}*/
+
+		// DIAGNOSTIKA
+
 		# predviden čas ankete
 		list($total,$skupni_cas) = $this->time;
         
@@ -213,382 +216,335 @@ class SurveyDiagnostics
 		} else {
 			$kompleksnost = $lang['srv_diagnostic_complexity_5'];
 		}
-		 
-		#OPOZORILA
-		echo '<div  class="floatLeft">';
-		echo '<div id="srv_diagnostic_results" >';
+
+		echo '<h2>'.$lang['srv_testiranje_diagnostika'].'</h2>';
+
 		echo '<table class="srv_diagnostic_results">';
 		echo '<tr>';
 		echo '<th>'.$lang['srv_diagnostika_table_title1'].'</th>';
-		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
+		echo '<th class="center">'.$lang['srv_diagnostika_table_title'].'</th>';
+		echo '<th class="center">'.$lang['srv_diagnostika_table_title2'].'</th>';
 		echo '</tr>';
-		#Preveč ali premalo opomnikov (reminder). 
-		
+
 		#Napake - v IFih, Zankah
+
+		//Link - kako odkriti logične in tehnične napake
+		if($lang['id'] == '1')
+			    $link_status = 'href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank"';
+            else
+				$link_status = 'href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank"';
+
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_5_element_1'].'</td>';
-		echo '<td>';
 
 		if (in_array(DIAG_INVALID_CONDITIONS,$this->diagnostic_note)) {
-            echo '<span class="red">';
-            if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-            echo '</span>';
+			$color_status = 'notok';
+			$msg_status = $lang['srv_diagnostic_neustreza'];
         }	
         else {
-            echo '<span class="green">';
-            if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-			echo '</span>';
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
 		}
-		echo '</td>';
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 		
 		#Napake - v validacijah
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_5_element_3'].'</td>';
-		echo '<td>';
 
 		if (in_array(DIAG_INVALID_VALIDATIONS, $this->diagnostic_note)) {
-            echo '<span class="red">';
-            if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-			echo '</span>';
+            $color_status = 'notok';
+			$msg_status = $lang['srv_diagnostic_neustreza'];
         }	
         else {
-            echo '<span class="green">';
-            if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-			echo '</span>';
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
 		}
-		echo '</td>';
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 		
-		#napake - Podovojenost imen varianel
+		#napake - Podovojenost imen variabel
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_5_element_2'].'</td>';
-		echo '<td>';
 		if (in_array(DIAG_INVALID_VARIABLENAMES,$this->diagnostic_note)) {
-            echo '<span class="red">';
-            if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_neustreza1'].'</a>';
-			echo '</span>';
-			echo '<span>&nbsp;';
-			echo '<a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&checkDuplicate=1" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span></a> '."\n";
-			echo '</span>';
+            $color_status = 'notok';
+            $msg_status = '<a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&checkDuplicate=1" title="'.$lang['srv_check_pogoji'].'">'.$lang['srv_diagnostic_neustreza'].'</a>';
         }	
         else {
-            echo '<span class="green">';
-            if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/kako-odkriti-logicne-tehnicne-napake-vprasalniku?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-            else
-                echo '<a href="https://www.1ka.si/d/en/help/faq/how-do-i-detect-logical-and-technical-errors-the-questionnaire?from1ka=1" target="_blank">'.$lang['srv_diagnostic_ustreza'].'</a>';
-			echo '</span>';
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
 		}
-		echo '</td>';
+		
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
-		
-		echo '</table>';
-		echo '</div>';
-		
-		echo '<br/><br/>';
 
-		echo '<div id="srv_diagnostic_results" >';
-		echo '<table class="srv_diagnostic_results">';
-#		echo '<COLGROUP><COL width="50%"><COL><COL><COLGROUP>';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_diagnostika_table_title2'].'</th>';
-		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
-		echo '</tr>';
-	
+		#OPOZORILA
 		# Preveč podvprašanj na eni strani.
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_1_element_1'].'</td>';
-        echo '<td>';
         
         if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-podvprasanj-bloku-prevec-vprasanj-na-eni-strani?from1ka=1" target="_blank">%s</a>';
+		    $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-podvprasanj-bloku-prevec-vprasanj-na-eni-strani?from1ka=1" target="_blank"';
         else    
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-subquestions-block-and-too-many-questions-on-one-page?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-subquestions-block-and-too-many-questions-on-one-page?from1ka=1" target="_blank"';
         
         if (in_array(DIAG_SPR_ON_PAGE,$this->diagnostic_note)) {
-			echo '<span class="red">';
-			printf($link,$lang['srv_diagnostic_neustreza2']);
-			echo '</span>';
+			$color_status = 'rec';
+			$msg_status = $lang['srv_diagnostic_rec'];
         }	
         else {
-			echo '<span class="green">';
-			printf($link,$lang['srv_diagnostic_ustreza']);
-			echo '</span>';
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
 		}
-		echo '</td>';
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 		
 		# Preveč vprašanj v bloku.
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_1_element_2'].'</td>';
-        echo '<td>';
         
         if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/premajhna-strukturiranost-vprasalnika?from1ka=1" target="_blank">%s</a>';
+			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/premajhna-strukturiranost-vprasalnika?from1ka=1" target="_blank"';
         else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/insufficiently-structured-questionnaire?from1ka=1" target="_blank">%s</a>';
+			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/insufficiently-structured-questionnaire?from1ka=1" target="_blank"';
         
         if (in_array(DIAG_SPR_IN_BLOCK,$this->diagnostic_note)) {
-			echo '<span class="red">';
-			printf($link,$lang['srv_diagnostic_neustreza2']);
-			echo '</span>';
-		}	else {
-			echo '<span class="green">';
-			printf($link,$lang['srv_diagnostic_ustreza']);
-			echo '</span>';
+			$color_status = 'rec';
+			$msg_status = $lang['srv_diagnostic_rec'];
 		}
-		echo '</td>';
+		else {
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
+		}
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 
 		# Preveč podpvprašanj v multigridu
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_1_element_3'].'</td>';
-        echo '<td>';
 
         if($lang['id'] == '1')
-            $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-podvprasanj-bloku-prevec-vprasanj-na-eni-strani?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-podvprasanj-bloku-prevec-vprasanj-na-eni-strani?from1ka=1" target="_blank"';
         else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-subquestions-block-and-too-many-questions-on-one-page?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-subquestions-block-and-too-many-questions-on-one-page?from1ka=1" target="_blank"';
 
 		if (in_array(DIAG_SUB_Q_IN_GRID,$this->diagnostic_note)) {
-			echo '<span class="red">';
-			printf($link,$lang['srv_diagnostic_neustreza2']);
-			echo '</span>';
-		}	else {
-			echo '<span class="green">';
-			printf($link,$lang['srv_diagnostic_ustreza']);
-			echo '</span>';
+			$color_status = 'rec';
+			$msg_status = $lang['srv_diagnostic_rec'];
 		}
+		else {
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
+		}
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 		echo '</td>';
 		echo '</tr>';
 		
 		#Začetek ankete z neprimernimi vprašanji.
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_2_element_1'].'</td>';
-        echo '<td>';
         
         if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/zacetek-ankete-z-neprimernimi-vprasanji?from1ka=1" target="_blank">%s</a>';
+		    $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/zacetek-ankete-z-neprimernimi-vprasanji?from1ka=1" target="_blank"';
         else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/beginning-the-survey-with-inappropriate-questions?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/beginning-the-survey-with-inappropriate-questions?from1ka=1" target="_blank"';
         
         if (in_array(DIAG_UNAPROPRIATE_START,$this->diagnostic_note)) {
-			echo '<span class="red">';
-			printf($link,$lang['srv_diagnostic_neustreza2']);
-			echo '</span>';
-		}	else {
-			echo '<span class="green">';
-			printf($link,$lang['srv_diagnostic_ustreza']);
-			echo '</span>';
+			$color_status = 'rec';
+			$msg_status = $lang['srv_diagnostic_rec'];
 		}
-		echo '</td>';
+		else {
+			$color_status = 'ok';
+			$msg_status = $lang['srv_diagnostic_ustreza'];
+		}
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
+		
 		# predolga anketa - opozorilo
 		if (in_array(DIAG_TIME_HARD_LIMIT,$this->diagnostic_note)) {
 			echo '<tr>';
 			echo '<td>'.$lang['srv_diagnostic_2_element_2'].'</td>';
-			echo '<td>';
-            echo '<span class="red">';
             
-            if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank">';
-            else
-                echo '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank">';
-            
-            echo $lang['srv_diagnostic_neustreza'];
-			echo '</a>';
-			echo '</span>';
-			echo '</td>';
+			if($lang['id'] == '1')
+		    	$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
+        	else
+            	$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
+
+			$color_status = 'rec';
+			$msg_status = $lang['srv_diagnostic_rec'];
+			
+			echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+			echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 			echo '</tr>';
 		}
-		echo '</table>';
-		echo '</div>';
-		
+
 		# PRIPOROČILA
-		echo '<br/><br/>';
-		echo '<div id="srv_diagnostic_results" >';
-		echo '<table class="srv_diagnostic_results">';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_diagnostika_table_title3'].'</th>';
-		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
-		echo '</tr>';
-		#Preveč ali premalo opomnikov (reminder). 
+		#Preveč ali premalo opomnikov (reminder) - 2 vrstici 
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_3_element_1'].'</td>';
-        echo '<td>';
 
         if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-ali-premalo-opomnikov?from1ka=1" target="_blank">%s</a>';
+		    $link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-ali-premalo-opomnikov?from1ka=1" target="_blank"';
         else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-or-too-few-reminders?from1ka=1" target="_blank">%s</a>';
+            $link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-or-too-few-reminders?from1ka=1" target="_blank"';
         
             if (in_array(DIAG_REMINDER_ON_IF,$this->diagnostic_note)) {
-			echo '<span class="red">';
-			printf($link,$lang['srv_diagnostic_neustreza']);
-			echo '</span>';
-		}	else {
-			echo '<span class="green">';
-			printf($link,$lang['srv_diagnostic_ustreza']);
-			echo '</span>';
-		}
-		echo '</td>';
+				$color_status = 'rec';
+				$msg_status = $lang['srv_diagnostic_rec'];
+			}
+			else {
+				$color_status = 'ok';
+				$msg_status = $lang['srv_diagnostic_ustreza'];
+			}
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
 		
 		echo '<tr>';
 		echo '<td>'.$lang['srv_diagnostic_3_element_2'].'</td>';
-        echo '<td>';
-
-        if($lang['id'] == '1')
-		    $link = '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/prevec-ali-premalo-opomnikov?from1ka=1" target="_blank">%s</a>';
-        else
-            $link = '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/too-many-or-too-few-reminders?from1ka=1" target="_blank">%s</a>';
         
             if (in_array(DIAG_REMINDER_ON_MGRID,$this->diagnostic_note)) {
-			echo '<span class="red">';
-			printf($link,$lang['srv_diagnostic_neustreza']);
-			echo '</span>';
-		}	else {
-			echo '<span class="green">';
-			printf($link,$lang['srv_diagnostic_ustreza']);
-			echo '</span>';
-		}
-		echo '</td>';
+				$color_status = 'rec';
+				$msg_status = $lang['srv_diagnostic_rec'];
+			}
+			else {
+				$color_status = 'ok';
+				$msg_status = $lang['srv_diagnostic_ustreza'];
+			}
+
+		echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 		echo '</tr>';
+
 		# predolga naketa - priporočilo
 		if (in_array(DIAG_TIME_SOFT_LIMIT,$this->diagnostic_note)) {
 			echo '<tr>';
 			echo '<td>'.$lang['srv_diagnostic_2_element_2'].'</td>';
-			echo '<td>';
-            echo '<span class="red">';
             
-            if($lang['id'] == '1')
-			    echo '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank">';
-            else
-                echo '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank">';
+           if($lang['id'] == '1')
+				$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
+        	else
+				$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
             
-                echo $lang['srv_diagnostic_neustreza'];
-			echo '</a>';
-			echo '</span>';
-			echo '</td>';
+			$color_status = 'rec';
+			$msg_status = $lang['srv_diagnostic_rec'];
+
+			echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
+			echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
 			echo '</tr>';
 		}
+		
+		echo '</table>';
+
+		// LASTNOSTI ANKETE
+		echo '<h2>'.$lang['srv_testiranje_diagnostika_lastnosti'].'</h2>';
+
+		echo '<div class="lastnosti_wrapper">';
+		
+		echo '<div class="lastnosti_left">';
+		echo '<table class="srv_diagnostic_results">';
+		echo '<tr>';
+		echo '<th>'.$lang['srv_diagnostika_table_title4'].'</th>';
+		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
+		echo '</tr>';
+		
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_1_element_5'].'</td>';
+        echo '<td>';
+		echo $time.'&nbsp&nbsp';
+        if($lang['id'] == '1')
+			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
+        else
+			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
+		echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_9'].'</td>';
+		echo '<td>'.(int)SurveyInfo::getSurveyGroupCount().'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_5'].'</td>';
+		echo '<td>'.(int)$this->cnt_spremenljivka.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_5a'].'</td>';
+		echo '<td>'.(int)$this->cnt_hidden.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_8'].'</td>';
+		echo '<td>'.(int)SurveyInfo::getSurveyVariableCount().'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_2'].'</td>';
+		echo '<td>'.(int)$this->cnt_conditions.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_3'].'</td>';
+		echo '<td>'.(int)$this->cnt_blocks.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_4_element_4'].'</td>';
+		echo '<td>'.(int)$this->globina.'</td>';
+		echo '</tr>';
+		echo '<tr>';
+		echo '<td>'.$lang['srv_diagnostic_1_element_4'].'</td>';
+		echo '<td>';
+		echo $kompleksnost.'&nbsp&nbsp';
+        
+		if($lang['id'] == '1')
+			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank"';
+        else
+			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank"';
+        
+		echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
+		echo '</a>';
+		echo '</tr>';
+		
 		echo '</table>';
 		echo '</div>';
-		echo '</div>';
-		
+
 		
+		echo '<div class="lastnosti_right">';
 		# Trajanje - linki
-		echo '<div id="srv_diagnostic_results_right">';
 		echo '<table class="srv_diagnostic_results">';
 		echo '<tr>';
 		echo '<th>'.$lang['srv_info_duration'].'</th>';
 		echo '<th></th>';
-		echo '<th></th>';
+		echo '<th class="center">'.$lang['srv_diagnostika_table_title2'].'</th>';
 		echo '</tr>';
+
 		echo '<tr>';
 		echo '<td>'.$lang['srv_testiranje_predvidenicas'].'</td>';
 		echo '<td>'.$skupni_cas.'</td>';
-		echo '<td><a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas" title="'.$lang['srv_testiranje_predvidenicas'].'">'.$lang['details'].'</a></td>';
+		echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas" title="'.$lang['srv_testiranje_predvidenicas'].'"></a></td>';
 		echo '</tr>';
+		
 		$sas = new SurveyAdminSettings();
 		$dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1);
 		echo '<tr>';
 		echo '<td>'.$lang['srv_testiranje_cas'].'</td>';
 		echo '<td>'.$dejanski_cas.'</td>';
-		echo '<td><a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'" title="'.$lang['srv_testiranje_cas'].'">'.$lang['details'].'</a></td>';
-		echo '</tr>';
-		echo '</table>';
-		echo '</div>';
-		echo '<br /><br />';
-		
-		
-		echo '<div id="srv_diagnostic_results_right">';
-		echo '<table class="srv_diagnostic_results">';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_diagnostika_table_title4'].'</th>';
-		echo '<th colspan="2">'.$lang['srv_diagnostika_table_title'].'</th>';
-		echo '</tr>';
-		/*echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_0'].'</td>';
-		echo '<td colspan="2">'.$skupni_cas.'</td>';
-		echo '</tr>';*/
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_5'].'</td>';
-
-        echo '<td colspan="2">';   
-
-        if($lang['id'] == '1')
-		    echo '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank">';
-        else
-            echo '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank">';
-
-		echo $time;
-		echo '</a>';
-#		echo Help::display('srv_diag_time').'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_9'].'</td>';
-		echo '<td colspan="2">'.(int)SurveyInfo::getSurveyGroupCount().'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_5'].'</td>';
-		echo '<td colspan="2">'.(int)$this->cnt_spremenljivka.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_5a'].'</td>';
-		echo '<td colspan="2">'.(int)$this->cnt_hidden.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_8'].'</td>';
-		echo '<td colspan="2">'.(int)SurveyInfo::getSurveyVariableCount().'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_2'].'</td>';
-		echo '<td colspan="2">'.(int)$this->cnt_conditions.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_3'].'</td>';
-		echo '<td colspan="2">'.(int)$this->cnt_blocks.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_4'].'</td>';
-		echo '<td colspan="2">'.(int)$this->globina.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_4'].'</td>';
-		echo '<td colspan="2">';
-        
-        if($lang['id'] == '1')
-            echo '<a href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank">';
-        else
-            echo '<a href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank">';
-        
-            echo $kompleksnost;
-		echo '</a>';
-		#echo Help::display('srv_diag_complexity').'</td>';
+		echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'" title="'.$lang['srv_testiranje_cas'].'"></a></td>';
 		echo '</tr>';
 		
 		echo '</table>';
 		echo '</div>';
-		echo '<br /><br />';
-		
-		
+
+		echo '</div>';
+
+		// KOMENATRJI
 		# nerazrešeni komentarji uporabnikov $commentsUser,$commentsUserFinished		
 		$commentsUserUnresolved = $commentsUser - $commentsUserFinished;
 		if ((	(int)$commentsAll 
@@ -598,7 +554,8 @@ class SurveyDiagnostics
 				+(int)$commentsUser
 				+(int)$commentsUserFinished
 				) > 0 ) { 
-			echo '<div id="srv_diagnostic_results_right">';
+			
+			echo '<h2>'.$lang['srv_diagnostic_4_element_0'].'</h2>';
 			echo '<table class="srv_diagnostic_results">';
 			echo '<tr>';
 			echo '<th>'.$lang['srv_diagnostic_4_element_0'].'</th>';
@@ -626,11 +583,8 @@ class SurveyDiagnostics
 			echo '<td>'.(int)$commentsUser.'</td>';
 			echo '</tr>';
 			echo '</table>';
-			echo '</div>';
 		}
 		
-
-		echo '<br /><br />';
 		echo '</div>'; # id="srv_diagnostic"
 	}
 	
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 3ad9f52f0..2ac44b3bd 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5454,7 +5454,7 @@ function removeUploadFromData(usr_id, spr_id, code){
 function CopyToClipboard(copyText){
 	var temp_copy = $('<input>').val(copyText).appendTo('body').select()
 	document.execCommand('copy')
-  }
+}
 
 // Popup - opozorilo na vsa vprašanja
 function popupAlertAll(alert_type){
diff --git a/lang/1.php b/lang/1.php
index 0541d402c..e2a391413 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5214,6 +5214,7 @@ $lang = array (
 	"reg_before_posting"						=>	"Prosimo, prijavite se pred pisanjem.",
 	"srv_testiranje_review"						=>	"Pregled",
 	"srv_testiranje_diagnostika"				=>	"Diagnostika",
+	"srv_testiranje_diagnostika_lastnosti"		=>	"Lastnosti ankete",
 	"srv_testiranje_diagnostika_base"			=>	"Osnovna diagnostika",
 	"srv_testiranje_komentarji"					=>	"Komentarji",
 	"srv_testiranje_komentarji_anketa"			=>	"Komentarji na anketo",
@@ -5292,9 +5293,8 @@ $lang = array (
 	"srv_diagnostic_5_element_2" 				=> 'Preverjanje podvojenosti imen variabel',
 	"srv_diagnostic_5_element_3" 				=> 'Preverjanje validacij na spremenljivkah',
 	"srv_diagnostic_ustreza" 					=> 'OK',
-	"srv_diagnostic_neustreza1" 				=> 'Odpravite napako',
-	"srv_diagnostic_neustreza2" 				=> 'Priporočamo popravek',
-	"srv_diagnostic_neustreza" 					=> 'Priporočamo razmislek',
+	"srv_diagnostic_neustreza" 					=> 'Napaka',
+	"srv_diagnostic_rec" 						=> 'Priporočilo',
 	"srv_diagnostic_time_1" 					=> 'Zelo kratka anketa',
 	"srv_diagnostic_time_2" 					=> 'Kratka anketa',
 	"srv_diagnostic_time_3" 					=> 'Srednje dolga anketa',
@@ -5495,9 +5495,14 @@ $lang = array (
     "srv_user_custom_checkbox"                  =>  'Izbira velikosti checkbox/radio gumbov',
 	"srv_online_edit"							=>	'Online urejanje teme',
 	"srv_offline_edit"							=>	'Offline urejanje teme',
+	"srv_diagnostika_testiranje"				=>	'Testiranje',
+	"srv_diagnostika_testiranje_notea"			=>	'Spodaj je povezava do ročnega testnega vnosa, kjer se podatki shranijo kot testni. V zavihku ',
+	"srv_diagnostika_testiranje_noteb"			=>	'\'TESTIRANJE\' - \'Avtomatski vnosi\'',
+	"srv_diagnostika_testiranje_notec"			=>	' lahko testne podatke vnesete tudi avtomatsko.',
+	"srv_diagnostika_testiranje_copy"			=>	'Kopiraj',
 	"srv_diagnostika_table_title"				=>	'Status',
-	"srv_diagnostika_table_title1"				=>	'Napake',
-	"srv_diagnostika_table_title2"				=>	'Opozorila',
+	"srv_diagnostika_table_title1"				=>	'Kriterij',
+	"srv_diagnostika_table_title2"				=>	'Podrobnosti',
 	"srv_diagnostika_table_title3"				=>	'Priporočila',
 	"srv_diagnostika_table_title4"				=>	'Lastnost',
 	"srv_ttest"									=>	'T-test',
diff --git a/lang/2.php b/lang/2.php
index d253b0114..d15fa4a4c 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5189,6 +5189,7 @@ $lang = array (
 	"reg_before_posting"						=>	"Please login before posting.",
 	"srv_testiranje_review"						=>	"View",
 	"srv_testiranje_diagnostika"				=>	"Diagnostics",
+	"srv_testiranje_diagnostika_lastnosti"		=>	"Survey properties",
 	"srv_testiranje_diagnostika_base"			=>	"Base diagnostics",
 	"srv_testiranje_komentarji"					=>	"Comments",
 	"srv_testiranje_vnosi"						=>	"Test responses",
@@ -5277,9 +5278,8 @@ $lang = array (
 	"srv_diagnostic_5_element_2" 				=> 'Duplicate variable names',
 	"srv_diagnostic_5_element_3" 				=> 'Error in question validations',
 	"srv_diagnostic_ustreza" 					=> 'OK',
-	"srv_diagnostic_neustreza1" 				=> 'Correct the error',
-	"srv_diagnostic_neustreza2" 				=> 'We recommend correction',
-	"srv_diagnostic_neustreza" 					=> 'Consideration recommended',
+	"srv_diagnostic_neustreza" 					=> 'Error',
+	"srv_diagnostic_rec" 						=> 'Reccomendation',
 	"srv_diagnostic_time_1" 					=> 'Very short survey',
 	"srv_diagnostic_time_2" 					=> 'Short survey',
 	"srv_diagnostic_time_3" 					=> 'Medium long survey',
@@ -5459,9 +5459,14 @@ $lang = array (
     "srv_user_custom_checkbox"                  =>  'Select checkbox/radio buttons:',
 	"srv_online_edit"							=>	'Online editing',
 	"srv_offline_edit"							=>	'Offline editing',
+	"srv_diagnostika_testiranje"				=>	'Test',
+	"srv_diagnostika_testiranje_notea"			=>	'Below is a link to the manual test entry where the data is saved as test data. In the ',
+	"srv_diagnostika_testiranje_noteb"			=>	'\'TEST\' - \'Test responses\'',
+	"srv_diagnostika_testiranje_notec"			=>	' tab, you can also enter the test data automatically.',
+	"srv_diagnostika_testiranje_copy"			=>	'Copy',
 	"srv_diagnostika_table_title"				=>	'Status',
-	"srv_diagnostika_table_title1"				=>	'Errors',
-	"srv_diagnostika_table_title2"				=>	'Warnings',
+	"srv_diagnostika_table_title1"				=>	'Criteria',
+	"srv_diagnostika_table_title2"				=>	'Details',
 	"srv_diagnostika_table_title3"				=>	'Recommendations',
 	"srv_diagnostika_table_title4"				=>	'Survey properties',
 	"srv_ttest"									=>	'T-test',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index ede551dc5..116b960ee 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5057,6 +5057,21 @@ p, span {
   margin-block-start: 0;
   margin-block-end: 0;
 }
+p.bottom16, span.bottom16 {
+  margin-bottom: 16px;
+}
+p.top16, span.top16 {
+  margin-top: 16px;
+}
+p.top32, span.top32 {
+  margin-top: 32px;
+}
+p.bottom8, span.bottom8 {
+  margin-bottom: 8px;
+}
+p.top8, span.top8 {
+  margin-top: 8px;
+}
 
 .warning,
 .red {
@@ -5075,12 +5090,6 @@ p, span {
   font-style: italic;
 }
 
-.as_link {
-  text-decoration: underline;
-  color: #1E88E5;
-  cursor: pointer;
-}
-
 .bold {
   font-weight: 800;
 }
@@ -5097,6 +5106,12 @@ p, span {
   text-transform: uppercase;
 }
 
+.as_link {
+  text-decoration: underline;
+  color: #1E88E5;
+  cursor: pointer;
+}
+
 .pointer {
   cursor: pointer;
 }
@@ -6011,7 +6026,8 @@ span.faicon.dots_ver:before {
   font-weight: 600;
 }
 
-span.faicon.open_icon::before {
+span.faicon.open_icon::before,
+a.faicon.open_icon::before {
   content: "\f35d";
 }
 
@@ -6023,6 +6039,10 @@ span.faicon.list::before {
   content: "\f03a";
 }
 
+span.faicon.link-chain::before {
+  content: "\f0c1";
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
@@ -8813,6 +8833,9 @@ div.button_holder.bottom0 {
 div.button_holder.inline {
   align-items: flex-end;
 }
+div.button_holder.inline.center {
+  align-items: center;
+}
 div.button_holder.inline button {
   margin-left: 16px;
 }
@@ -8950,21 +8973,6 @@ fieldset legend {
   color: #1E88E5;
   text-transform: uppercase;
 }
-fieldset p.bottom16 {
-  margin-bottom: 16px;
-}
-fieldset p.top16 {
-  margin-top: 16px;
-}
-fieldset p.top32 {
-  margin-top: 32px;
-}
-fieldset p.bottom8 {
-  margin-bottom: 8px;
-}
-fieldset p.top8 {
-  margin-top: 8px;
-}
 fieldset .setting_horizontal_wrapper {
   display: flex;
   flex-direction: row;
@@ -9995,14 +10003,55 @@ table.variableView {
   width: 100%;
 }
 
-div.srv_diagnostic h2 {
+div#srv_diagnostic h2 {
   font-size: 24px;
   margin-top: 32px;
-  margin-bottom: 16x;
+  margin-bottom: 16px;
+  font-weight: 300;
 }
-div.srv_diagnostic h2:first-of-type {
+div#srv_diagnostic h2:first-of-type {
   margin-top: 0;
 }
+div#srv_diagnostic table {
+  width: 100%;
+}
+div#srv_diagnostic table td div.status_wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+div#srv_diagnostic table td div.status_wrapper div.status {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 24px;
+  min-width: 88px;
+  border-radius: 2px;
+  font-size: 14px;
+}
+div#srv_diagnostic table td div.status_wrapper div.status.notok {
+  background-color: #FFE3E3;
+}
+div#srv_diagnostic table td div.status_wrapper div.status.ok {
+  background-color: #E3F6DE;
+}
+div#srv_diagnostic table td div.status_wrapper div.status.rec {
+  background-color: #EAF9FE;
+}
+div#srv_diagnostic table td div.status_wrapper div.status a {
+  color: inherit;
+  text-decoration: none;
+}
+div#srv_diagnostic div.lastnosti_wrapper {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  gap: 32px;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right {
+  width: 50%;
+}
 
 div.subpage_predvidenicas table,
 div.subpage_cas table {
diff --git a/resources/sass/admin_new/basic/colors.scss b/resources/sass/admin_new/basic/colors.scss
index dd5e1875a..89b9d0110 100644
--- a/resources/sass/admin_new/basic/colors.scss
+++ b/resources/sass/admin_new/basic/colors.scss
@@ -29,3 +29,7 @@ $green: #00C437;
 $light-green: #a8eea8;
 $light-green2: #E3F6DE;
 
+$status-red: #FFE3E3;
+$status-green: #E3F6DE;
+$status-blue: #EAF9FE;
+
diff --git a/resources/sass/admin_new/basic/font.scss b/resources/sass/admin_new/basic/font.scss
index 2f9b9c102..ec06bf94f 100644
--- a/resources/sass/admin_new/basic/font.scss
+++ b/resources/sass/admin_new/basic/font.scss
@@ -14,6 +14,7 @@ body {
 }
 
 //font-weight
+$light: 300;
 $regular: 400;
 $semi-bold: 600;
 $extra-bold: 800;
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index 7a5e33ebc..5ee572821 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -660,7 +660,8 @@ span.faicon.dots_ver:before{
 }
 
 // Open (new tab)
-span.faicon.open_icon::before{
+span.faicon.open_icon::before,
+a.faicon.open_icon::before{
         content: "\f35d";
 }
 
@@ -673,3 +674,9 @@ span.faicon.table_icon::before{
 span.faicon.list::before{
     content: "\f03a";
 }
+
+//Link
+span.faicon.link-chain::before{
+        content: "\f0c1";
+}
+
diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss
index 9034fd8b6..826676777 100644
--- a/resources/sass/admin_new/basic/typography.scss
+++ b/resources/sass/admin_new/basic/typography.scss
@@ -3,8 +3,30 @@ p,span {
 	font-size: 16px;
 	margin-block-start: 0;
     margin-block-end: 0;
+
+	//Razmiki med besedilom
+	&.bottom16 {
+	margin-bottom: 16px;
+	}
+
+	&.top16 {
+	margin-top: 16px;
+	}
+
+	&.top32 {
+		margin-top: 32px;
+	}
+
+	&.bottom8 {
+		margin-bottom: 8px;
+	}
+
+	&.top8 {
+		margin-top: 8px;
+	}
 }
 
+//Barve
 .warning,
 .red {
 	color: $red;
@@ -18,16 +40,11 @@ p,span {
 	color: $very-dark-gray;
 }
 
+//Stili
 .italic {
 	font-style: italic;
 }
 
-.as_link {
-	text-decoration: underline;
-	color: $blue;
-	cursor: pointer;
-}
-
 .bold {
 	font-weight: $extra-bold;
 }
@@ -44,6 +61,13 @@ p,span {
 	text-transform: uppercase;
 }
 
+//Ostalo
+.as_link {
+	text-decoration: underline;
+	color: $blue;
+	cursor: pointer;
+}
+
 .pointer {
 	cursor: pointer;
 }
diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss
index 3587fa37b..d6c3e5553 100644
--- a/resources/sass/admin_new/components/form/button.scss
+++ b/resources/sass/admin_new/components/form/button.scss
@@ -135,6 +135,10 @@ div.button_holder {
     &.inline {
     align-items: flex-end;
 
+        &.center {
+            align-items: center;
+        }
+
         button {
             margin-left: 16px;
         }
diff --git a/resources/sass/admin_new/components/form/fieldset.scss b/resources/sass/admin_new/components/form/fieldset.scss
index 9a52e06a6..921403fa3 100644
--- a/resources/sass/admin_new/components/form/fieldset.scss
+++ b/resources/sass/admin_new/components/form/fieldset.scss
@@ -17,29 +17,6 @@ fieldset{
         text-transform: uppercase;
     }
 
-    //Razmiki med besedilom
-    p{
-        &.bottom16 {
-		margin-bottom: 16px;
-        }
-
-        &.top16 {
-		margin-top: 16px;
-        }
-
-        &.top32 {
-            margin-top: 32px;
-            }
-
-        &.bottom8 {
-            margin-bottom: 8px;
-            }
-    
-        &.top8 {
-        margin-top: 8px;
-        }
-	}
-
     //Wrapper za polja drug ob drugem horizontalno
     .setting_horizontal_wrapper {
         display: flex;
diff --git a/resources/sass/admin_new/pages/my_surveys/testiranje.scss b/resources/sass/admin_new/pages/my_surveys/testiranje.scss
index 704a25dc6..acbbb6154 100644
--- a/resources/sass/admin_new/pages/my_surveys/testiranje.scss
+++ b/resources/sass/admin_new/pages/my_surveys/testiranje.scss
@@ -1,15 +1,71 @@
 // DIAGNOSTIKA
-div.srv_diagnostic {
+div#srv_diagnostic {
     h2 {
         font-size: 24px;
         margin-top: 32px;
-        margin-bottom: 16x;
+        margin-bottom: 16px;
+
+        font-weight: $light;
         
         &:first-of-type {
             margin-top: 0;
         }
 
     }
+
+    table {
+        width: 100%;
+
+        td {
+            div.status_wrapper {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                
+                div.status {
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+
+                    height: 24px;
+                    min-width: 88px;
+                    border-radius: 2px;
+    
+                    font-size: 14px;
+    
+                    &.notok {
+                        background-color: $status-red;
+                    }
+    
+                    &.ok {
+                        background-color: $status-green;
+                    }
+
+                    &.rec {
+                        background-color: $status-blue;
+                    }
+
+                    a {
+                        color: inherit;
+                        text-decoration: none;
+                    }
+                }
+            }
+        }
+    }
+
+    div.lastnosti_wrapper {
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+        gap: 32px;
+
+        div.lastnosti_left,
+        div.lastnosti_right {
+            width: 50%;
+        }
+        
+    }
 }
 
 //OCENJEVANJE TRAJANJA, DEJANSKI ČASI