diff --git a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/behavior/AlignmentBehavior.java b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/behavior/AlignmentBehavior.java
index f95c4f30d..67d04d630 100644
--- a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/behavior/AlignmentBehavior.java
+++ b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/behavior/AlignmentBehavior.java
@@ -37,8 +37,8 @@ public class AlignmentBehavior extends BootstrapBaseBehavior {
      * TODO miha: add documentation.
      */
     public enum Alignment implements ICssClassNameProvider {
-        RIGHT("pull-right"),
-        LEFT("pull-left"),
+        RIGHT("float-end"),
+        LEFT("float-start"),
         NONE("");
         private String className;
 
diff --git a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/block/QuoteBehavior.java b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/block/QuoteBehavior.java
index ea4c00f07..1cc8670b1 100644
--- a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/block/QuoteBehavior.java
+++ b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/markup/html/bootstrap/block/QuoteBehavior.java
@@ -58,7 +58,7 @@ public void onComponentTag(Component component, ComponentTag tag) {
      * @return this component's instance
      */
     public final QuoteBehavior pullRight() {
-        pullRight.setObject("pull-right");
+        pullRight.setObject("float-end");
 
         return this;
     }
diff --git a/bootstrap-core/src/test/java/de/agilecoders/wicket/core/util/AttributesTest.java b/bootstrap-core/src/test/java/de/agilecoders/wicket/core/util/AttributesTest.java
index fe9846275..e26a9a57b 100644
--- a/bootstrap-core/src/test/java/de/agilecoders/wicket/core/util/AttributesTest.java
+++ b/bootstrap-core/src/test/java/de/agilecoders/wicket/core/util/AttributesTest.java
@@ -48,9 +48,9 @@ void nullClassNameThrowsException() {
     @Test
     void removeClass() {
         ComponentTag tag = new ComponentTag("span", XmlTag.TagType.OPEN_CLOSE);
-        tag.put("class", "class1 pull-right class2");
+        tag.put("class", "class1 float-end class2");
 
-        Attributes.removeClass(tag, "pull-right");
+        Attributes.removeClass(tag, "float-end");
 
         assertThat(tag.getAttribute("class"), is(equalTo("class1 class2")));
     }
diff --git a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/table/sort/BootstrapOrderByBorder.html b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/table/sort/BootstrapOrderByBorder.html
index 23ae0678f..ebb39f1ac 100644
--- a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/table/sort/BootstrapOrderByBorder.html
+++ b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/table/sort/BootstrapOrderByBorder.html
@@ -1,6 +1,6 @@
 <wicket:border xmlns:wicket="http://wicket.apache.org">
 	<a href="#" wicket:id="orderByLink" style="text-decoration: none;">
 		<wicket:body />
-		<span class="pull-right"  wicket:enclosure>&nbsp;<span wicket:id="iconSort"></span></span>
+		<span class="float-end"  wicket:enclosure>&nbsp;<span wicket:id="iconSort"></span></span>
 	</a>
 </wicket:border>
\ No newline at end of file
diff --git a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/table/toolbars/BootstrapNavigationToolbar.html b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/table/toolbars/BootstrapNavigationToolbar.html
index b906c1adc..6f0a6e601 100644
--- a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/table/toolbars/BootstrapNavigationToolbar.html
+++ b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/table/toolbars/BootstrapNavigationToolbar.html
@@ -18,8 +18,8 @@
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
 	<tr class="navigation">
 		<td wicket:id="span">
-			<div class="pull-left"><wicket:container wicket:id="navigatorLabelPanel">[navigator-label]</wicket:container></div>
-			<div class="pull-right"><ul wicket:id="navigator">[navigator]</ul></div>
+			<div class="float-start"><wicket:container wicket:id="navigatorLabelPanel">[navigator-label]</wicket:container></div>
+			<div class="float-end"><ul wicket:id="navigator">[navigator]</ul></div>
 		</td>
 	</tr>
-</wicket:panel>
\ No newline at end of file
+</wicket:panel>