Index: lams_admin/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_gradebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_learning/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0 -ra998094a90b98b008a1956e057b41e655b363896
--- lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0)
+++ lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_monitoring/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_forum/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_images/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_leader/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_preview/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_survey/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_task/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_vote/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>
Index: lams_www/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r74e39981b5e776f87368242e4881abc1015f490e -ra998094a90b98b008a1956e057b41e655b363896
--- lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 74e39981b5e776f87368242e4881abc1015f490e)
+++ lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision a998094a90b98b008a1956e057b41e655b363896)
@@ -126,9 +126,9 @@
 	            </a>
 	
 				<c:if test="${showHeader}">
-		            <header id="header" class="d-flex justify-content-between" role="banner">
-		                <div class="d-flex">
-							<button class="no-decoration" id="hamb" type="button" accesskey="p" 
+		            <header id="header" class="d-flex justify-content-between align-items-center" role="banner">
+		                <div class="d-flex align-items-center">
+							<button class="btn btn-light no-decoration" id="hamb" type="button" accesskey="p" 
 									data-bs-toggle="offcanvas" data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
 									aria-labelledby="offcanvas-progress-bar-title"
@@ -140,12 +140,12 @@
 		                </div>
 		                
 		                <div class="top-menu">
-		                    <button id="profile-picture" class="no-decoration px-3" type="button"
+		                    <button id="profile-picture" class="btn btn-light no-decoration px-3" type="button"
 		                            onclick="javascript:showMyPortraitDialog()" title="<fmt:message key='label.your.portrait'/>" >
 		                        <img class="portrait-sm portrait-round" src="${pageLearnerPortraitSrc}" alt="<fmt:message key='label.your.portrait'/>">
 		                    </button>
 		                    
-		                    <button type="button" id="progress-bar-widget" class="no-decoration d-none d-sm-none d-md-block"
+		                    <button type="button" id="progress-bar-widget" class="btn btn-light no-decoration d-none d-sm-none d-md-block"
 		                    		data-bs-toggle="offcanvas" 
 		                    		data-bs-target="#component-offcanvas"
 									aria-controls="component-offcanvas"
@@ -165,7 +165,7 @@
 		                    </button>
 		                    
 		                    <c:if test="${not isIntegrationLogin}">
-		                    	<a href="/" id="return-to-index" class="btn-close btn-sm float-end ms-3" 
+		                    	<a href="/" id="return-to-index" class="btn btn-light btn-close btn-sm" 
 		                    			title="<fmt:message key='label.close.and.return'/>"></a>
 		                    </c:if>
 		                </div>