diff --git a/news/95.news b/news/95.news
new file mode 100644
index 0000000..fc711eb
--- /dev/null
+++ b/news/95.news
@@ -0,0 +1 @@
+Adapt viewlet styles to Plone 6 [pbauer]
\ No newline at end of file
diff --git a/plone/app/iterate/browser/cancel.pt b/plone/app/iterate/browser/cancel.pt
index a1af209..8c53eb0 100644
--- a/plone/app/iterate/browser/cancel.pt
+++ b/plone/app/iterate/browser/cancel.pt
@@ -28,7 +28,7 @@
       <div class="formControls">
 
         <input
-            class="destructive"
+            class="btn btn-danger"
             type="submit"
             name="form.button.Cancel"
             value="Cancel checkout"
@@ -36,7 +36,7 @@
             />
 
         <input
-            class="standalone"
+            class="btn btn-secondary"
             type="submit"
             name="form.button.Keep"
             value="Keep checkout"
diff --git a/plone/app/iterate/browser/checkin.pt b/plone/app/iterate/browser/checkin.pt
index ebfa2ed..e385d10 100644
--- a/plone/app/iterate/browser/checkin.pt
+++ b/plone/app/iterate/browser/checkin.pt
@@ -45,7 +45,7 @@
 
             <div class="formControls">
                 <input
-                    class="context"
+                    class="btn btn-primary"
                     type="submit"
                     name="form.button.Checkin"
                     value="Check in"
@@ -53,7 +53,7 @@
                     />
 
                 <input
-                    class="standalone"
+                    class="btn btn-secondary"
                     type="submit"
                     name="form.button.Cancel"
                     value="Cancel"
diff --git a/plone/app/iterate/browser/checkout.pt b/plone/app/iterate/browser/checkout.pt
index b6abebd..42cc0c2 100644
--- a/plone/app/iterate/browser/checkout.pt
+++ b/plone/app/iterate/browser/checkout.pt
@@ -71,7 +71,7 @@
         <div class="formControls">
 
             <input
-                class="context"
+                class="btn btn-primary"
                 type="submit"
                 name="form.button.Checkout"
                 value="Check out"
@@ -79,7 +79,7 @@
                 />
 
             <input
-                class="standalone"
+                class="btn btn-secondary"
                 type="submit"
                 name="form.button.Cancel"
                 value="Cancel"
diff --git a/plone/app/iterate/browser/configure.zcml b/plone/app/iterate/browser/configure.zcml
index ffcb1f4..d713819 100644
--- a/plone/app/iterate/browser/configure.zcml
+++ b/plone/app/iterate/browser/configure.zcml
@@ -19,7 +19,7 @@
         name="content-checkout"
         class=".checkout.Checkout"
         template="checkout.pt"
-        permission="zope2.View"
+        permission="plone.app.iterate.CheckOutContent"
         />
 
     <browser:page
@@ -27,7 +27,7 @@
         name="content-checkin"
         class=".checkin.Checkin"
         template="checkin.pt"
-        permission="cmf.ModifyPortalContent"
+        permission="plone.app.iterate.CheckInContent"
         />
 
     <browser:page
@@ -45,7 +45,7 @@
        class=".diff.DiffView"
        name="iterate_diff"
        template="diff.pt"
-       permission="zope2.View"
+       permission="cmf.ModifyPortalContent"
        />
 
     <browser:viewlet
diff --git a/plone/app/iterate/browser/info.py b/plone/app/iterate/browser/info.py
index 300acf4..8a56d49 100644
--- a/plone/app/iterate/browser/info.py
+++ b/plone/app/iterate/browser/info.py
@@ -9,6 +9,7 @@
 from plone.app.iterate.interfaces import ICheckinCheckoutPolicy
 from plone.app.iterate.interfaces import keys
 from plone.app.iterate.permissions import CheckoutPermission
+from plone.app.layout.viewlets.globalstatusmessage import MTYPES_DISPLAY
 from plone.memoize.instance import memoize
 from Products.CMFCore.permissions import ModifyPortalContent
 from Products.CMFCore.utils import getToolByName
@@ -97,6 +98,10 @@ def properties(self):
     def _getReference(self):
         raise NotImplementedError
 
+    def display_info_for_mtype(self, mtype):
+        """get info for display of an mtype"""
+        return MTYPES_DISPLAY.get(mtype, MTYPES_DISPLAY["info"])
+
 
 class BaselineInfoViewlet(BaseInfoViewlet):
 
diff --git a/plone/app/iterate/browser/info_baseline.pt b/plone/app/iterate/browser/info_baseline.pt
index 4738777..dc9da15 100644
--- a/plone/app/iterate/browser/info_baseline.pt
+++ b/plone/app/iterate/browser/info_baseline.pt
@@ -1,10 +1,16 @@
-<div class="portalMessage warning"
+<div class="portalMessage ${python:display_info['cssclass']}"
      tal:define="working_copy view/working_copy;
-                 isAnon context/@@plone_portal_state/anonymous;"
+                 isAnon context/@@plone_portal_state/anonymous;
+                 display_info python:view.display_info_for_mtype('warning');
+                 icons nocall: context/@@iconresolver;
+                 "
      i18n:domain="plone"
-     tal:condition="python: not isAnon">
+     tal:condition="python: not isAnon"
+     role="alert">
 
-    <strong i18n:translate="">Warning</strong>
+    <tal:icon tal:replace="structure python:icons.tag(display_info['icon'], tag_alt=display_info['msg'], tag_class='statusmessage-icon mb-1 me-2')" />
+
+    <strong>${python:display_info['msg']}</strong>
     <tal:block i18n:translate="working_copy_info">
         This item is being edited by
         <a i18n:name="creator"
diff --git a/plone/app/iterate/browser/info_checkout.pt b/plone/app/iterate/browser/info_checkout.pt
index 1eccd5e..c538342 100644
--- a/plone/app/iterate/browser/info_checkout.pt
+++ b/plone/app/iterate/browser/info_checkout.pt
@@ -1,8 +1,13 @@
-<div class="portalMessage info"
-     tal:define="baseline view/baseline;"
+<div class="portalMessage ${python:display_info['cssclass']}"
+     tal:define="baseline view/baseline;
+                 display_info python:view.display_info_for_mtype('warning');
+                 icons nocall: context/@@iconresolver;
+                 "
      i18n:domain="plone">
 
-    <strong i18n:translate="">Warning</strong>
+    <tal:icon tal:replace="structure python:icons.tag(display_info['icon'], tag_alt=display_info['msg'], tag_class='statusmessage-icon mb-1 me-2')" />
+
+    <strong>${python:display_info['msg']}</strong>
     <tal:block i18n:translate="checkout_info">
 
         This is a working copy of
diff --git a/plone/app/iterate/configure.zcml b/plone/app/iterate/configure.zcml
index 6b64a41..a1e695c 100644
--- a/plone/app/iterate/configure.zcml
+++ b/plone/app/iterate/configure.zcml
@@ -10,6 +10,16 @@
   <include package="zope.component" file="meta.zcml"/>
   <include package="zope.viewlet" file="meta.zcml"/>
 
+  <permission
+    id="plone.app.iterate.CheckInContent"
+    title="iterate : Check in content"
+    />
+
+  <permission
+    id="plone.app.iterate.CheckOutContent"
+    title="iterate : Check out content"
+    />
+
   <include package="plone.locking" />
   <include package="plone.memoize" />
   <include package="Products.CMFCore" />
@@ -106,16 +116,6 @@
      handler=".event.handleDeletion"
      />
 
-  <permission
-    id="plone.app.iterate.CheckInContent"
-    title="iterate : Check in content"
-    />
-
-  <permission
-    id="plone.app.iterate.CheckOutContent"
-    title="iterate : Check out content"
-    />
-
   <include package=".dexterity" zcml:condition="installed plone.app.relationfield" />
   <include file="at.zcml" zcml:condition="installed Products.Archetypes.BaseObject" />