diff --git a/assets/scripts/expressions/em_javascript.js b/assets/scripts/expressions/em_javascript.js
index ed9e5812eeb..dc92b828944 100644
--- a/assets/scripts/expressions/em_javascript.js
+++ b/assets/scripts/expressions/em_javascript.js
@@ -43,7 +43,7 @@ $(document).on("change",".radio-item :radio:not([onclick]), .button-item :radio:
     checkconditions($(this).val(), $(this).attr('name'), 'radio', 'click')
 });
 /* checkbox item */
-$(document).on("change",".checkbox-item :checkbox:not([onclick])",function(event){
+$(document).on("change",".checkbox-item :checkbox:not([onclick]),.button-item :checkbox:not([onclick])",function(event){
     checkconditions($(this).val(), $(this).attr('name'), 'checkbox', 'click')
 });
 
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/answer.twig b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/answer.twig
index b89fcbc060f..0df2830fabd 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/answer.twig
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/answer.twig
@@ -8,13 +8,10 @@
 #}
 
 <!-- List Radio -->
-
 <!-- answer -->
 {{ sTimer }}
-
-<div class="row {{coreClass}}" role="group">
-    <div class="list-unstyled form-inline btn-toolbar col-sm-12 " data-toggle="buttons" role="radiogroup" aria-labelledby="ls-question-text-{{name }}">
-
+<div class="container-fluid">
+    <div class="row {{coreClass}} form-inline " data-toggle="buttons" role="radiogroup" aria-labelledby="ls-question-text-{{name }}">
     {# rows/answer_row.php #}
     {{ sRows }}
 
@@ -26,17 +23,13 @@
     }}
     </div>
     {# Must add it only of other is set ! #}
-    <div class="col-sm-12 hide" id="{{ name }}-div">
-        <label for="answer{{ name }}othertext" class="control-label" id="label-id-{{ name }}">{{ othertext }}</label>
-        <!-- comment -->
-        {{ gT('Other:') }}
+    <div class="row ls-js-hidden form-inline answer-item" id="div{{ name }}other">
+        <label for="answer{{ name }}othertext" class="control-label" id="label-id-{{ name }}">{{ gT('Other:') }}</label>
         <input
         type="text"
-        class="form-control {{ kpclass }} input-sm col-sm-4"
+        class="form-control {{ kpclass }} input-sm"
         id="answer{{ name }}othertext"
         name="{{ name }}other"
-        title="{{ gT('Other') }}"
-        onkeyup="checkconditions(this.value, this.name, this.type);"
         >
         </label>
     </div>
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.css b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.css
index 8419acfc4b0..ea38af0d382 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.css
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.css
@@ -1,12 +1 @@
-.bootstrap-item input {
-    visibility:hidden !important;
-    display: none !important;
-}
-
- .bootstrap-item {
-    margin: 2px 2px; 
-}
-
- .bootstrap-buttons-div {
-    padding: 0 2px;
- }
\ No newline at end of file
+.bootstrap-buttons-div{margin-bottom:0.2em} /* Usage of em since we don't know size set by theme */
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.js b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.js
index d42c98df19c..3d8fd230ee6 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.js
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.js
@@ -1,34 +1,13 @@
-/*
- * This file is part of LimeSurvey
- * See COPYRIGHT.php for copyright notices and details.
- * @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt  GNU/GPL License v2 or later
- *
- * This javascript updates value of "other" input field, shows "other" input field when "Other" radio button is checked
- * and triggers validation
- */
-
-
-
-$( document ).ready(function() {
-	$(".bootstrap-radio-value").each( function( index, element ){
-		if ($(this).val()){
-		    name = $(this).data('name');
-		    // "other" input field
-		    $("#answer" + name + "othertext").val($(this).val());
-		    $("#" + name + "-div").removeClass('hide');
-		    // execute validation
-		    checkconditions($(this).val(), name, this.type);
-	    }
-	});
-
-	$(".bootstrap-radio").change(function(){
-		name = $(this).attr('name');
-		// conditionaly show or hide "other" input field
-	    if ($(this).val() === '-oth-'){
-	    	$("#" + name + "-div").removeClass('hide');
-	    } else {
-	    	$("#" + name + "-div").addClass('hide');
-	    	$("#answer" + name + "othertext").val('');
-	    }
-	});
-});
\ No newline at end of file
+function doBootstrapRadio(){
+    $(".button-item .bootstrap-radio").change(function(){
+        name = $(this).attr('name');
+        // conditionaly show or hide "other" input field
+        if ($(this).val() === '-oth-'){
+            $("#div" + name + "other").removeClass('ls-js-hidden');
+        } else {
+            $("#div" + name + "other").addClass('ls-js-hidden');
+            $("#answer" + name + "othertext").val('').trigger("change");
+        }
+    });
+    
+}
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig
index 8e1578aea04..d98490019cb 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig
@@ -15,9 +15,9 @@
 
 <!-- answer_row -->
 <div class="bootstrap-buttons-div col-xs-12 {{ max_buttons_row }}">
-    <div  id="javatbd{{ myfname }}" class="bootstrap-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
+    <div  id="javatbd{{ myfname }}" class="button-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
         <input
-            class="radio bootstrap-radio"
+            class="bootstrap-radio sr-only"
             type="radio"
             name="{{ name }}"
             id="answer{{ name }}{{ code }}"
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_noanswer.twig b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_noanswer.twig
index 3994a2bcfa7..31776095472 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_noanswer.twig
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_noanswer.twig
@@ -13,9 +13,9 @@
 
 <!-- answer_row_noanswer -->
 <div class="bootstrap-buttons-div col-xs-12 {{ max_buttons_row }}">
-    <div id="javatbd{{ name }}F" class="bootstrap-item btn btn-primary {{ button_size_class }} {% if check_ans!='' %} active {% endif %} col-xs-12 col-sm-12">
+    <div id="javatbd{{ name }}" class="button-item btn btn-primary {{ button_size_class }} {% if check_ans!='' %} active {% endif %} col-xs-12 col-sm-12">
         <input
-            class="radio bootstrap-radio"
+            class="bootstrap-radio sr-only"
             type="radio"
             name="{{ name }}"
             id="answer{{ name }}"
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_other.twig b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_other.twig
index dc156c27201..18648a5e652 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_other.twig
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row_other.twig
@@ -22,20 +22,19 @@
 <!-- answer_row_other -->
 <!-- Checkbox + label -->
 <div class="bootstrap-buttons-div col-xs-12 {{ max_buttons_row }}">
-    <div id="javatbd{{ name }}F" class="bootstrap-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active focus {% endif %} col-xs-12 col-sm-12"  {{ sDisplayStyle }}>
+    <div id="javatbd{{ name }}other" class="button-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active focus {% endif %} col-xs-12 col-sm-12"  {{ sDisplayStyle }}>
         <input
-            class="radio bootstrap-radio"
+            class="bootstrap-radio sr-only"
             type="radio"
             value="-oth-"
             name="{{ name }}"
-            id="SOTH{{ name }}"
+            id="answer{{ name }}othercbox"
             {{ checkedState }}
             />
-        <label for="answer{{ name }}">
-            <span class="" aria-hidden="true"></span> {{ gT('Other') }}
+        <label for="answer{{ name }}othercbox">
+            {{ gT('Other') }}
         </label>
     </div>
-    <input type="hidden" class="bootstrap-radio-value" {{ answer_other }} name="answer{{ name }}othervalue" data-name="{{ name }}" id="answer{{ name }}othervalue">
 </div>
+<script>doBootstrapRadio();</script>
 <!-- end of answer_row_other -->
-
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/scripts/bootstrapbuttons.js b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/scripts/bootstrapbuttons.js
index 64d332fc5e1..35c54cdd4b4 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/scripts/bootstrapbuttons.js
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/scripts/bootstrapbuttons.js
@@ -10,19 +10,6 @@
 
 
 $( document ).ready(function() {
-	
-	// ROW
-	$(".bootstrap-checkbox").change(function(){
-		name = $(this).data('name');
-		// set value for java element
-	    if ($(this).is(':checked')){
-	    	$("#java" + name).val('Y');
-	    } else {
-	    	$("#java" + name).val('');
-	    }
-	    checkconditions(this.value, this.name, this.type);
-	});
-
 	// OTHER
 	$(".bootstrap-checkbox-other-value").each( function( index, element ){
 		name = $(this).data('name');
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig
index 2367578fcf4..30c2f0ce36d 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig
@@ -21,12 +21,12 @@
 
 <!-- answer_row -->
 <div class="bootstrap-buttons-div col-xs-12 {{ max_buttons_row }}">
-    <div id='javatbd{{ myfname }}' class="bootstrap-item btn btn-primary checkbox-item {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
+    <div id='javatbd{{ myfname }}' class="button-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
         <input
             type="checkbox"
             name="{{ myfname }}"
             data-name="{{myfname}}"
-            class="bootstrap-checkbox"
+            class="bootstrap-checkbox sr-only"
             id="answer{{ myfname }}"
             {{ checkedState }}
             value="Y"
diff --git a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row_other.twig b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row_other.twig
index bf871de88db..d8dab0f735f 100644
--- a/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row_other.twig
+++ b/themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row_other.twig
@@ -17,12 +17,12 @@
 
 <!-- answer_row_other -->
 <div class="bootstrap-buttons-div col-xs-12 {{ max_buttons_row }}">
-    <div id='javatbd{{ myfname }}' class="bootstrap-item btn btn-primary checkbox-item {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
+    <div id='javatbd{{ myfname }}' class="button-item btn btn-primary {{ button_size_class }} {% if checkedState!='' %} active {% endif %} col-xs-12 col-sm-12">
 
         <!-- Checkbox + label -->
             <!-- checkbox -->
             <input
-                class="other-checkbox bootstrap-checkbox-other"
+                class="other-checkbox bootstrap-checkbox-other sr-only"
                 type="checkbox"
                 name="{{myfname}}cbox"
                 id="answer{{myfname}}cbox"
@@ -38,7 +38,7 @@
             name="java{{myfname}}"
             id="java{{myfname}}"
             value="{{sValueHidden}}"
-            class="bootstrap-checkbox-other-value"
+            class="button-checkbox-other-value"
             data-name="{{myfname}}"
         />
     </div>