diff --git a/wp-content/themes/tcs-responsive/css/challenge-detail-software.css b/wp-content/themes/tcs-responsive/css/challenge-detail-software.css
index 157c5c77..113f2c78 100644
--- a/wp-content/themes/tcs-responsive/css/challenge-detail-software.css
+++ b/wp-content/themes/tcs-responsive/css/challenge-detail-software.css
@@ -469,6 +469,7 @@
     border-radius: 3px;
     behavior: url(./css/PIE.htc);
     position: relative;
+    z-index:2;
 }
 
 .reviewStyle p a.tooltip:hover {
diff --git a/wp-content/themes/tcs-responsive/js/app/challenge-details/ng-challenge-detail-software.js b/wp-content/themes/tcs-responsive/js/app/challenge-details/ng-challenge-detail-software.js
index 193d00e4..7916acc9 100644
--- a/wp-content/themes/tcs-responsive/js/app/challenge-details/ng-challenge-detail-software.js
+++ b/wp-content/themes/tcs-responsive/js/app/challenge-details/ng-challenge-detail-software.js
@@ -241,12 +241,14 @@ function removeClass(obj, cls) {
 var tooltipTimeout;
 
 function showTooltip(source, num) {
+  //bugfix refactored-challenge-details-14: tooltips moved to correct location near icons 
   getElementsByClassName('tip' + num)[0].style.display = 'block';
-  getElementsByClassName('tip' + num)[0].style.top = source.getBoundingClientRect().top + (document.documentElement.scrollTop || document.body.scrollTop) + 2 + 'px';
-  if (hasClass(getElementsByClassName('tip' + num)[0], 'reviewStyleTip')) {
-    getElementsByClassName('tip' + num)[0].style.left = source.getBoundingClientRect().left + (document.documentElement.scrollLeft || document.body.scrollLeft) - 210 + 'px';
+  getElementsByClassName('tip' + num)[0].style.top = source.getBoundingClientRect().top + (document.documentElement.scrollTop || document.body.scrollTop) - 105 + 'px';
+  if ($(window).width() > 1440) {
+    getElementsByClassName('tip' + num)[0].style.left = source.getBoundingClientRect().left + (document.documentElement.scrollLeft || document.body.scrollLeft) + 14 + 'px';
   } else {
-    getElementsByClassName('tip' + num)[0].style.left = source.getBoundingClientRect().left + (document.documentElement.scrollLeft || document.body.scrollLeft) + 32 + 'px';
+    getElementsByClassName('tip' + num)[0].style.left = source.getBoundingClientRect().left + (document.documentElement.scrollLeft || document.body.scrollLeft) - 210 + 'px';
+
   }
 }