diff --git a/contribs/gmf/src/map/mousepositionComponent.html b/contribs/gmf/src/map/mousepositionComponent.html
index e273274b5f47..426a599aa1a0 100644
--- a/contribs/gmf/src/map/mousepositionComponent.html
+++ b/contribs/gmf/src/map/mousepositionComponent.html
@@ -1,5 +1,5 @@
 <div class="btn-group dropup">
-  <a type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+  <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
     <span class="gmf-mouseposition-control-target"></span>
   </a>
   <ul class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/contribs/gmf/src/print/component.html b/contribs/gmf/src/print/component.html
index 82972dc29370..05d660e57f9e 100644
--- a/contribs/gmf/src/print/component.html
+++ b/contribs/gmf/src/print/component.html
@@ -28,9 +28,10 @@
 
         <div
           ng-if="attribute.type === 'checkbox'"
-          class="checkbox">
-          <label>
+          class="form-check">
+          <label class="form-check-label">
             <input
+              class="form-check-input"
               ng-model="attribute.value"
               type="checkbox">
             <span>{{attribute.name | translate}}</span>
diff --git a/contribs/gmf/src/raster/widgetComponent.html b/contribs/gmf/src/raster/widgetComponent.html
index 58b2eb7c078f..645920992f05 100644
--- a/contribs/gmf/src/raster/widgetComponent.html
+++ b/contribs/gmf/src/raster/widgetComponent.html
@@ -6,7 +6,7 @@
     gmf-elevation-layer="ctrl.selectedElevationLayer"
     gmf-elevation-layersconfig="ctrl.layersconfig"
     gmf-elevation-map="::ctrl.map">
-  <a type="button" class="btn btn-default" aria-expanded="false"
+  <a class="btn btn-default" aria-expanded="false"
     ng-class="::{'dropdown-toggle': ctrl.layers.length > 1}"
     ng-attr-data-toggle="{{::(ctrl.layers.length > 1) ? 'dropdown' : ''}}"
     >
diff --git a/contribs/gmf/src/sass/input-range.scss b/contribs/gmf/src/sass/input-range.scss
index 3f1631171807..27c1555325f2 100644
--- a/contribs/gmf/src/sass/input-range.scss
+++ b/contribs/gmf/src/sass/input-range.scss
@@ -19,14 +19,12 @@ input[type=range] {
   border: 0;
   background-color: transparent;
 
-  &,
-  &:focus {
+  &:hover, &:focus {
+    outline: none;
     box-shadow: none;
+    background-color: transparent;
   }
 }
-input[type=range]:focus {
-  outline: none;
-}
 input[type=range]::-webkit-slider-runnable-track {
   width: 100%;
   height: $gmf-input-range-track-height;
diff --git a/src/editing/attributescomponent.html b/src/editing/attributescomponent.html
index 27765d4c54f8..807534969843 100644
--- a/src/editing/attributescomponent.html
+++ b/src/editing/attributescomponent.html
@@ -21,10 +21,11 @@
 
         <div
             ng-switch-when="boolean"
-            class="checkbox">
-          <label>
+            class="form-check">
+          <label class="form-check-label">
             <input
                 name="{{::attribute.name}}"
+                class="form-check-input"
                 ng-model="attrCtrl.properties[attribute.name]"
                 ng-change="attrCtrl.handleInputChange(attribute.name);"
                 type="checkbox">