diff --git a/projects/common/element-components/text.component.ts b/projects/common/element-components/text.component.ts
index 5f2c503dfdcc3dce86707a8142f730ba074a0a9a..ddb0124ef63a48a84242c33de571b679e2e729ff 100644
--- a/projects/common/element-components/text.component.ts
+++ b/projects/common/element-components/text.component.ts
@@ -9,7 +9,7 @@ import { TextElement } from '../models/text-element';
   template: `
     <div [style.width.%]="100"
          [style.height]="'auto'">
-      <div *ngIf="elementModel.highlightable || elementModel.underlinable"
+      <div *ngIf="elementModel.highlightable"
            class="marking-bar">
         <ng-container *ngIf="elementModel.highlightable">
           <button class="marking-button" mat-mini-fab [style.background-color]="'yellow'"
@@ -25,12 +25,6 @@ import { TextElement } from '../models/text-element';
             <mat-icon>border_color</mat-icon>
           </button>
         </ng-container>
-        <ng-container *ngIf="elementModel.underlinable">
-          <button class="marking-button" mat-mini-fab [style.background-color]="'white'"
-                  (click)="onMarkingButtonClick($event, { mode: 'underline', color: 'black', element: container })">
-            <mat-icon>format_underlined</mat-icon>
-          </button>
-        </ng-container>
         <button class="marking-button" [style.background-color]="'lightgrey'" mat-mini-fab
                 (click)="onMarkingButtonClick($event, { mode: 'delete', color: 'none', element: container })">
           <mat-icon>clear</mat-icon>
diff --git a/projects/common/models/text-element.ts b/projects/common/models/text-element.ts
index cb34797a28906ffef8f52d9834b63cd41fb9c944..78a1a2b5283056d149abd719412aae0508ecc7b5 100644
--- a/projects/common/models/text-element.ts
+++ b/projects/common/models/text-element.ts
@@ -5,7 +5,6 @@ import { initSurfaceElement } from '../util/unit-interface-initializer';
 export class TextElement extends UIElement implements SurfaceUIElement {
   text: string = '<p>Lorem ipsum dolor sit amet</p>';
   highlightable: boolean = false;
-  underlinable: boolean = false;
   fontColor: string = 'black';
   font: string = 'Roboto';
   lineHeight: number = 120;
diff --git a/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html b/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html
index 9dcdcb04f41f938bf66751facee99dad0a897217..b0470ef70094f6302dd8e9b76d08e5ffdb9805c4 100644
--- a/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html
+++ b/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html
@@ -43,11 +43,6 @@
                       (change)="updateModel('highlightable', $event.checked)">
           {{'propertiesPanel.highlightable' | translate }}
         </mat-checkbox>
-        <mat-checkbox *ngIf="combinedProperties.underlinable !== undefined"
-                      [checked]="$any(combinedProperties.underlinable)"
-                      (change)="updateModel('underlinable', $event.checked)">
-          {{'propertiesPanel.underlinable' | translate }}
-        </mat-checkbox>
 
         <mat-checkbox *ngIf="combinedProperties.strikeOtherOptions !== undefined"
                       [checked]="$any(combinedProperties.strikeOtherOptions)"