diff --git a/admin/survey/classes/class.SurveyUrlLinks.php b/admin/survey/classes/class.SurveyUrlLinks.php
index 64ddedf0b..808b0a6e5 100644
--- a/admin/survey/classes/class.SurveyUrlLinks.php
+++ b/admin/survey/classes/class.SurveyUrlLinks.php
@@ -56,16 +56,14 @@ class SurveyUrlLinks
 		
 		$podstran = $_REQUEST['podstran'];
 		$m = $_REQUEST['m'];
-		
-		//@TG9
-		$popUp = new PopUp();
-		$popUp->setId('div_survey_links');
-		$popUp->setHeaderText($lang['srv_public_link_title'].':');
-		
+
+		echo '<div id="div_survey_links">';
+
+		echo '<h2>'.$lang['srv_public_link_title'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">✕</a></div>';
+
 		#vsebino shranimo v buffer
         ob_start();
-        
-        echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">✕</a></div>';
 
 		if ($msg != null){
 			echo '<p class="bottom16">'.($msg);
@@ -156,19 +154,14 @@ class SurveyUrlLinks
 			
 			echo '</table>';
 		}
-		
-		#dodamo vsebino
-		$content = ob_get_clean();
-		$popUp->setContent($content);
-		
-		# dodamo gumb Preklici
-		$buttonClose = new PopUpCancelButton();
-        $buttonClose->setCaption($lang['srv_zapri'])->setTitle($lang['srv_zapri']);
-        $buttonClose->setFloat('right');
-		$popUp->addButton($buttonClose);
 
-		echo $popUp;
-		
+		echo $content;
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium blue" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\'); return false;">'.$lang['srv_close_profile'].'</button>';              
+        echo '</div>';
+
+        echo '</div>';
 	}
 	
 	function addLink(){
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 0c7d3388a..786f605cc 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -4474,7 +4474,7 @@ function showTestSurveySMTP()
 function showSurveyUrlLinks(podstran, m)
 {
 	$('#fade').fadeTo('slow', 1);
-	$('#fullscreen').html('').fadeIn('slow');
+	$('#fullscreen').html('').addClass('divPopUp').fadeIn('slow');
 	$("#fullscreen").load('ajax.php?t=SurveyUrlLinks&a=showLinks',
 	{
 		anketa:srv_meta_anketa_id,