diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php
index d652f7000..3b2e29e9b 100644
--- a/main/survey/app/Controllers/BodyController.php
+++ b/main/survey/app/Controllers/BodyController.php
@@ -2275,7 +2275,7 @@ class BodyController extends Controller
                             echo '</a>';
                         }
 
-                        echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/js-lang.php?lang=si&amp;v=13.06.07"></script>';
+                        echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/js-lang.php?lang='.self::$lang['lang_short'].'&amp;v=13.06.07"></script>';
                         // Ce je tole vklopljeno se js porusi?
                         //echo '<script type="text/javascript" src="'.self::$site_url.'/admin/survey/minify/g=jsnew?v=13.06.07"></script>';
                         echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/jquery/jquery.qtip-1.0.js"></script>';
@@ -2327,7 +2327,7 @@ class BodyController extends Controller
                             echo '</a>';
                         }
 
-                        echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/js-lang.php?lang=si&amp;v=13.06.07"></script>';
+                        echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/js-lang.php?lang='.self::$lang['lang_short'].'&amp;v=13.06.07"></script>';
                         // Ce je tole vklopljeno se js porusi?
                         //echo '<script type="text/javascript" src="'.self::$site_url.'/admin/survey/minify/g=jsnew?v=13.06.07"></script>';
                         echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/jquery/jquery.qtip-1.0.js"></script>';
diff --git a/public/css/main.css b/public/css/main.css
index 57ccda6cf..cd95c9012 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -7283,4 +7283,113 @@ button.ui-datepicker-trigger::before {
   color: #aaa;
 }
 
+/* toostip popups - komentarji */
+.qtip {
+  max-width: 90vw;
+  padding: 15px !important;
+  background-color: white;
+  border-left: 6px #1e88e5 solid !important;
+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34);
+}
+.qtip .popup_close {
+  position: absolute !important;
+  top: 20px;
+  right: 20px;
+  z-index: 9999;
+  font-size: 32px !important;
+  line-height: 25px;
+  color: lightgrey;
+}
+.qtip .popup_close:hover {
+  color: #1e88e5;
+}
+.qtip .popup_close a {
+  color: lightgrey;
+}
+.qtip .popup_close a:hover {
+  color: #1e88e5;
+}
+.qtip h2,
+.qtip .divPopUp_top {
+  max-width: 95%;
+  margin-top: 0px;
+  margin-bottom: 20px;
+  font-size: 20px;
+  line-height: 27px;
+  font-weight: 500;
+  color: #333;
+}
+.qtip p {
+  line-height: 20px;
+}
+.qtip a {
+  cursor: pointer;
+  display: inline;
+  color: #1e88e5;
+  text-decoration: none;
+}
+.qtip a:hover {
+  color: #ffa608;
+  text-decoration: none;
+}
+.qtip input[type=submit] {
+  padding: 0 10px;
+}
+.qtip textarea {
+  vertical-align: middle;
+  font-size: 12px;
+  color: #333 !important;
+  width: 40%;
+  padding: 10px;
+  border: 1px solid #c6c6c6 !important;
+  border-radius: 0;
+}
+.qtip .qtip-tip {
+  display: none !important;
+}
+.qtip .qtip-wrapper {
+  border: 0 !important;
+}
+.qtip .qtip-wrapper .qtip-contentWrapper {
+  border: 0 !important;
+}
+.qtip .qtip-wrapper .qtip-contentWrapper .qtip-title {
+  padding: 0 !important;
+  /*margin-top: 10px;*/
+  color: black !important;
+  font-size: 14px;
+  font-weight: 600;
+  background-color: white !important;
+}
+.qtip .qtip-wrapper .qtip-contentWrapper .qtip-title .qtip-button {
+  position: absolute !important;
+  top: 0px;
+  right: 0px;
+  font-size: 25px !important;
+  line-height: 18px;
+  color: lightgrey;
+}
+.qtip .qtip-wrapper .qtip-contentWrapper .qtip-title .qtip-button:hover {
+  color: #1e88e5;
+}
+.qtip .qtip-wrapper .qtip-contentWrapper .qtip-content {
+  overflow: visible !important;
+  padding: 0 !important;
+  margin-top: 10px;
+  font-size: 12px;
+  background-color: white !important;
+  border: 0;
+}
+.qtip .qtip-wrapper .qtip-contentWrapper .qtip-content textarea {
+  box-sizing: border-box;
+}
+.qtip .qtip-wrapper .qtip-contentWrapper .qtip-content .qtip-help {
+  margin-top: -10px;
+  padding-right: 30px;
+  line-height: 20px;
+}
+.qtip .qtip-borderTop, .qtip .qtip-borderBottom {
+  display: none !important;
+}
+
 /*# sourceMappingURL=main.css.map */
diff --git a/resources/sass/main/main/admin.scss b/resources/sass/main/main/admin.scss
index b697666c7..7ff48b1bf 100644
--- a/resources/sass/main/main/admin.scss
+++ b/resources/sass/main/main/admin.scss
@@ -339,3 +339,143 @@
     }
 }
 
+
+
+/* toostip popups - komentarji */
+.qtip{
+    max-width: 90vw;
+    padding: 15px !important;
+
+    background-color: white;
+    border-left: 6px #1e88e5 solid !important;
+    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.34);
+
+    .popup_close{
+        position: absolute !important;
+        top: 20px;
+        right: 20px;
+        z-index: 9999;
+
+        font-size: 32px !important;
+        line-height: 25px;
+        color: lightgrey;
+
+        &:hover{
+            color: #1e88e5;
+        }
+
+        a{
+            color: lightgrey;
+            
+            &:hover{
+                color: #1e88e5;
+            }
+        }
+    }
+
+    h2,
+    .divPopUp_top{
+        max-width: 95%;
+        margin-top: 0px;
+        margin-bottom: 20px;
+
+        font-size: 20px;
+        line-height: 27px;
+        font-weight: 500;
+        color: #333;
+    }
+
+    p{
+        line-height: 20px;
+    }  
+    
+    a{
+        cursor: pointer;
+        display: inline;
+        color: #1e88e5;
+        text-decoration: none;
+
+        &:hover {
+            color: #ffa608;
+            text-decoration: none;
+        }
+    }
+
+    input[type="submit"]{
+        padding: 0 10px;
+    }
+
+    textarea {
+        vertical-align: middle;
+        font-size: 12px;
+        color: #333 !important;
+        width: 40%;
+        padding: 5px;
+
+        border: 1px solid #c6c6c6 !important;
+        border-radius: 0;
+    }
+
+    .qtip-tip{
+        display: none !important;
+    }
+
+    .qtip-wrapper{
+        border: 0 !important;
+
+        .qtip-contentWrapper {
+            border: 0 !important;
+
+            .qtip-title {
+                padding: 0 !important;
+                /*margin-top: 10px;*/
+
+                color: black !important;
+                font-size: 14px;
+                font-weight: 600;
+
+                background-color: white !important;
+                
+                .qtip-button{
+                    position: absolute !important;
+                    top: 0px;
+                    right: 0px;
+
+                    font-size: 25px !important;
+                    line-height: 18px;
+                    color: lightgrey;
+
+                    &:hover{
+                        color: #1e88e5;
+                    }
+                }
+            }
+
+            .qtip-content {     
+                overflow: visible !important;
+                padding: 0 !important;
+                margin-top: 10px;
+                
+                font-size: 12px;
+                
+                background-color: white !important;
+                border: 0;
+
+                textarea{
+                    box-sizing: border-box;
+                }
+
+                .qtip-help{
+                    margin-top: -10px;
+                    padding-right: 30px;
+
+                    line-height: 20px;
+                }
+            }
+        }
+    }
+
+    .qtip-borderTop, .qtip-borderBottom {
+        display: none !important;
+    }
+}