diff --git a/src/z2ui5_cl_demo_app_000.clas.abap b/src/z2ui5_cl_demo_app_000.clas.abap
index 74f27742..603cc984 100644
--- a/src/z2ui5_cl_demo_app_000.clas.abap
+++ b/src/z2ui5_cl_demo_app_000.clas.abap
@@ -981,12 +981,21 @@ CLASS z2ui5_cl_demo_app_000 IMPLEMENTATION.
     ).
 
         panel->generic_tile(
-        header    = 'Page, Toolbar & Bar'
+        header    = 'Bar'
+        subheader = 'Page, Toolbar & Bar'
         press     =  client->_event( 'Z2UI5_CL_DEMO_APP_227' )
         mode      = 'LineMode'
         class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
     ).
 
+        panel->generic_tile(
+        header    = 'Bar'
+        subheader = 'Toolbar vs Bar vs OverflowToolbar'
+        press     =  client->_event( 'Z2UI5_CL_DEMO_APP_235' )
+        mode      = 'LineMode'
+        class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
+    ).
+
         panel = page->panel(
                    expandable = abap_false
                    expanded   = abap_true
diff --git a/src/z2ui5_cl_demo_app_235.clas.abap b/src/z2ui5_cl_demo_app_235.clas.abap
new file mode 100644
index 00000000..b14ae9d5
--- /dev/null
+++ b/src/z2ui5_cl_demo_app_235.clas.abap
@@ -0,0 +1,126 @@
+class z2ui5_cl_demo_app_235 definition
+  public
+  create public .
+
+public section.
+
+  interfaces IF_SERIALIZABLE_OBJECT .
+  interfaces Z2UI5_IF_APP .
+
+  data CHECK_INITIALIZED type ABAP_BOOL .
+  PROTECTED SECTION.
+
+    METHODS display_view
+      IMPORTING
+        client TYPE REF TO z2ui5_if_client.
+    METHODS on_event
+      IMPORTING
+        client TYPE REF TO z2ui5_if_client.
+
+  PRIVATE SECTION.
+ENDCLASS.
+
+
+
+CLASS z2ui5_cl_demo_app_235 IMPLEMENTATION.
+
+
+  METHOD DISPLAY_VIEW.
+
+    DATA(page_01) = z2ui5_cl_xml_view=>factory( )->shell(
+         )->page(
+            title          = 'abap2UI5 - Sample: Toolbar vs Bar vs OverflowToolbar'
+            navbuttonpress = client->_event( 'BACK' )
+            shownavbutton  = xsdbool( client->get( )-s_draft-id_prev_app_stack IS NOT INITIAL ) ).
+
+        DATA(page_02) = page_01->page(
+                         title = `Bar can center a Title.`
+                         titlelevel = `H2`
+                         class = `sapUiContentPadding`
+                         shownavbutton = abap_true
+                         )->header_content(
+                             )->button( icon = `sap-icon://action` )->get_parent(
+                         )->sub_header(
+                             )->toolbar(
+                                 )->button( type = `Back` tooltip = `Back`
+                                 )->toolbar_spacer(
+                                 )->title( text = `Toolbar center` level = `H3`
+                                 )->toolbar_spacer( )->get_parent( )->get_parent(
+                         )->content(
+                             )->message_strip( text = `A Toolbar's centering technique will be slightly off the center if there is a button on the left.` class = `sapUiTinyMargin`
+                             )->toolbar(
+                                 )->label( text = `Toolbar can shrink content in case of overflow.`
+                                     )->layout_data(
+                                         )->toolbar_layout_data( shrinkable = abap_false )->get_parent( )->get_parent(
+                                 )->button( text = `Accept` type = `Accept`
+                                     )->layout_data(
+                                         )->toolbar_layout_data( shrinkable = abap_true )->get_parent( )->get_parent(
+                                 )->label( text = `This is a long non-shrinkable label.`
+                                     )->layout_data(
+                                         )->toolbar_layout_data( shrinkable = abap_false )->get_parent( )->get_parent(
+                                 )->button( text = `Reject` type = `Reject`
+                                     )->layout_data(
+                                         )->toolbar_layout_data( shrinkable = abap_true )->get_parent( )->get_parent(
+                                 )->button( text = `Big Big Big Big Big Big Big Big Button`
+                                     )->layout_data(
+                                         )->toolbar_layout_data( shrinkable = abap_true )->get_parent( )->get_parent( )->get_parent(
+
+                                 )->label(
+                                 )->bar(
+                                     )->content_left(
+                                         )->label( text = `Bar cannot really handle overflow it just cuts the content.` )->get_parent(
+                                     )->content_middle(
+                                         )->button( text = `Accept` type = `Accept`
+                                         )->label( text = `This is a long non-shrinkable label.`
+                                         )->button( text = `Reject` type = `Reject`
+                                         )->button( text = `Edit`
+                                         )->button( text = `Big Big Big Big Big Big Big Big Button` )->get_parent( )->get_parent(
+
+                                 )->label(
+                                 )->overflow_toolbar(
+                                     )->label( text = `OverflowToolbar provides a See more (...) button for overflow.`
+                                         )->layout_data(
+                                             )->toolbar_layout_data( shrinkable = abap_false )->get_parent( )->get_parent(
+                                     )->button( text = `Accept` type = `Accept`
+                                         )->layout_data(
+                                             )->toolbar_layout_data( shrinkable = abap_true )->get_parent( )->get_parent(
+                                     )->label( text = `This is a long non-shrinkable label.`
+                                         )->layout_data(
+                                             )->toolbar_layout_data( shrinkable = abap_false )->get_parent( )->get_parent(
+                                     )->button( text = `Reject` type = `Reject`
+                                         )->layout_data(
+                                             )->toolbar_layout_data( shrinkable = abap_true )->get_parent( )->get_parent(
+                                     )->button( text = `Big Big Big Big Big Big Big Big Button`
+                                         )->layout_data(
+                                             )->toolbar_layout_data( shrinkable = abap_true )->get_parent( )->get_parent( )->get_parent( )->get_parent(
+
+                         )->footer(
+                             )->toolbar(
+                        ).
+
+    client->view_display( page_02->stringify( ) ).
+
+  ENDMETHOD.
+
+
+  METHOD ON_EVENT.
+
+    CASE client->get( )-event.
+      WHEN 'BACK'.
+        client->nav_app_leave( ).
+    ENDCASE.
+
+  ENDMETHOD.
+
+
+  METHOD Z2UI5_IF_APP~MAIN.
+
+    IF check_initialized = abap_false.
+      check_initialized = abap_true.
+      display_view( client ).
+    ENDIF.
+
+    on_event( client ).
+
+  ENDMETHOD.
+ENDCLASS.
diff --git a/src/z2ui5_cl_demo_app_235.clas.xml b/src/z2ui5_cl_demo_app_235.clas.xml
new file mode 100644
index 00000000..919d870c
--- /dev/null
+++ b/src/z2ui5_cl_demo_app_235.clas.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>Z2UI5_CL_DEMO_APP_235</CLSNAME>
+    <LANGU>E</LANGU>
+    <DESCRIPT>Toolbar vs Bar vs OverflowToolbar</DESCRIPT>
+    <STATE>1</STATE>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
+</abapGit>