diff --git a/Wave/Components/Pages/ArticleEditor.razor b/Wave/Components/Pages/ArticleEditor.razor
index 2f88f35..97c72a0 100644
--- a/Wave/Components/Pages/ArticleEditor.razor
+++ b/Wave/Components/Pages/ArticleEditor.razor
@@ -75,23 +75,48 @@
                                 </ToolbarButton>
 			                </ToolbarSection>
                             <ToolbarSection>
-	                            <ToolbarButton onclick="window.insertBeforeAndAfterSelection('**');" 
-	                                           title="@Localizer["Tools_Bold_Tooltip"]">
-	                                <strong>B</strong>
-	                            </ToolbarButton>
-	                            <ToolbarButton onclick="window.insertBeforeAndAfterSelection('*')" 
-	                                           title="@Localizer["Tools_Italic_Tooltip"]">
-	                                <em>I</em>
+                                <ToolbarButton onclick="window.insertBeforeAndAfterSelection('**');" 
+                                               title="@Localizer["Tools_Bold_Tooltip"]">
+                                    <strong>B</strong>
                                 </ToolbarButton>
-	                            <ToolbarButton onclick="window.insertBeforeAndAfterSelection('~~')" 
-	                                           title="@Localizer["Tools_StrikeThrough_Tooltip"]">
+                                <ToolbarButton onclick="window.insertBeforeAndAfterSelection('*')" 
+                                               title="@Localizer["Tools_Italic_Tooltip"]">
+                                    <em>I</em>
+                                </ToolbarButton>
+                                <ToolbarButton onclick="window.insertBeforeAndAfterSelection('++')" 
+                                               title="@Localizer["Tools_Underline_Tooltip"]">
+                                    <u>U</u>
+                                </ToolbarButton>
+                                <ToolbarButton onclick="window.insertBeforeAndAfterSelection('~~')" 
+                                               title="@Localizer["Tools_StrikeThrough_Tooltip"]">
                                     <del>@Localizer["Tools_StrikeThrough_Label"]</del>
                                 </ToolbarButton>
-	                            <ToolbarButton onclick="window.insertBeforeSelection('> ', true)"
-	                                           title="@Localizer["Tools_Cite_Tooltip"]">
+                                <ToolbarButton onclick="window.insertBeforeAndAfterSelection('==')" 
+                                               title="@Localizer["Tools_Mark_Tooltip"]">
+                                    <mark>@Localizer["Tools_Mark_Label"]</mark>
+                                </ToolbarButton>
+                                <ToolbarButton onclick="window.insertBeforeSelection('> ', true)"
+                                               title="@Localizer["Tools_Cite_Tooltip"]">
                                     | <em>@Localizer["Tools_Cite_Label"]</em>
                                 </ToolbarButton>
-			                </ToolbarSection>
+                            </ToolbarSection>
+                            <ToolbarSection>
+                                <ToolbarButton onclick="window.insertBeforeSelection('1. ', true)">
+                                    1.
+                                </ToolbarButton>
+                                <ToolbarButton onclick="window.insertBeforeSelection('a. ', true)">
+                                    a.
+                                </ToolbarButton>
+                                <ToolbarButton onclick="window.insertBeforeSelection('A. ', true)">
+                                    A.
+                                </ToolbarButton>
+                                <ToolbarButton onclick="window.insertBeforeSelection('i. ', true)">
+                                    i.
+                                </ToolbarButton>
+                                <ToolbarButton onclick="window.insertBeforeSelection('I. ', true)">
+                                    I.
+                                </ToolbarButton>
+                            </ToolbarSection>
 			                <ToolbarSection>
 				                <ToolbarButton onclick="window.insertBeforeAndAfterSelection('`')"
 				                               title="@Localizer["Tools_CodeLine_Tooltip"]">
diff --git a/Wave/Resources/Components/Pages/ArticleEditor.de-DE.resx b/Wave/Resources/Components/Pages/ArticleEditor.de-DE.resx
index 99b1d0b..32ad4ce 100644
--- a/Wave/Resources/Components/Pages/ArticleEditor.de-DE.resx
+++ b/Wave/Resources/Components/Pages/ArticleEditor.de-DE.resx
@@ -185,4 +185,10 @@
     <data name="Tools_CodeBlock_Tooltip" xml:space="preserve">
         <value>Programmierblock einfügen</value>
     </data>
+  <data name="Tools_Underline_Tooltip" xml:space="preserve">
+    <value>Text unterstreichen</value>
+  </data>
+  <data name="Tools_Mark_Tooltip" xml:space="preserve">
+    <value>Den selektierten Text markieren</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Wave/Resources/Components/Pages/ArticleEditor.resx b/Wave/Resources/Components/Pages/ArticleEditor.resx
index 6ee2009..b04e5f7 100644
--- a/Wave/Resources/Components/Pages/ArticleEditor.resx
+++ b/Wave/Resources/Components/Pages/ArticleEditor.resx
@@ -188,4 +188,13 @@
     <data name="Tools_CodeBlock_Tooltip" xml:space="preserve">
         <value>Insert program code block</value>
     </data>
+  <data name="Tools_Underline_Tooltip" xml:space="preserve">
+    <value>Underline text</value>
+  </data>
+  <data name="Tools_Mark_Label" xml:space="preserve">
+    <value>txt</value>
+  </data>
+  <data name="Tools_Mark_Tooltip" xml:space="preserve">
+    <value>Mark the selected text</value>
+  </data>
 </root>
\ No newline at end of file