diff --git a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
index 4355c5310..90eccec51 100644
--- a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html
@@ -108,18 +108,18 @@
                 </ion-item>
                 <ion-grid>
                     <ion-row align-items-center>
-                        <ion-col>
-                            <button ion-button block outline icon-start (click)="gotoAnswerQuestions(true)">
+                        <ion-col col-12 [attr.col-sm-6]="(access.cancomplete && access.cansubmit && access.isopen) || null">
+                            <button ion-button block outline icon-start (click)="gotoAnswerQuestions(true)" text-wrap>
                                 <ion-icon name="search"></ion-icon>
                                 {{ 'addon.mod_feedback.preview' | translate }}
                             </button>
                         </ion-col>
-                        <ion-col *ngIf="access.cancomplete && access.cansubmit && access.isopen">
-                            <button ion-button block icon-end *ngIf="!goPage" (click)="gotoAnswerQuestions()">
+                        <ion-col *ngIf="access.cancomplete && access.cansubmit && access.isopen" col-12 col-sm-6>
+                            <button ion-button block icon-end *ngIf="!goPage" (click)="gotoAnswerQuestions()" text-wrap>
                                 {{ 'addon.mod_feedback.complete_the_form' | translate }}
                                 <ion-icon name="arrow-forward"></ion-icon>
                             </button>
-                            <button ion-button block icon-end *ngIf="goPage" (click)="gotoAnswerQuestions()">
+                            <button ion-button block icon-end *ngIf="goPage" (click)="gotoAnswerQuestions()" text-wrap>
                                 {{ 'addon.mod_feedback.continue_the_form' | translate }}
                                 <ion-icon name="arrow-forward"></ion-icon>
                             </button>
diff --git a/src/addon/mod/feedback/pages/form/form.html b/src/addon/mod/feedback/pages/form/form.html
index adb569d88..99b805762 100644
--- a/src/addon/mod/feedback/pages/form/form.html
+++ b/src/addon/mod/feedback/pages/form/form.html
@@ -67,20 +67,20 @@
                 </ng-container>
                 <ion-grid *ngIf="!preview">
                     <ion-row align-items-center>
-                        <ion-col *ngIf="hasPrevPage">
-                            <button ion-button block outline icon-start (click)="gotoPage(true)">
+                        <ion-col *ngIf="hasPrevPage" col-12 col-sm-6>
+                            <button ion-button block outline icon-start (click)="gotoPage(true)" text-wrap>
                                 <ion-icon name="arrow-back"></ion-icon>
                                 {{ 'addon.mod_feedback.previous_page' | translate }}
                             </button>
                         </ion-col>
-                        <ion-col *ngIf="hasNextPage">
-                            <button ion-button block icon-end (click)="gotoPage(false)">
+                        <ion-col *ngIf="hasNextPage" col-12 [attr.col-sm-6]="(hasPrevPage) || null">
+                            <button ion-button block icon-end (click)="gotoPage(false)" text-wrap>
                                 {{ 'addon.mod_feedback.next_page' | translate }}
                                 <ion-icon name="arrow-forward"></ion-icon>
                             </button>
                         </ion-col>
-                        <ion-col *ngIf="!hasNextPage">
-                            <button ion-button block (click)="gotoPage(false)">
+                        <ion-col *ngIf="!hasNextPage" col-12 [attr.col-sm-6]="(hasPrevPage) || null">
+                            <button ion-button block (click)="gotoPage(false)" text-wrap>
                                 {{ 'addon.mod_feedback.save_entries' | translate }}
                             </button>
                         </ion-col>
@@ -98,14 +98,14 @@
 
         <ion-grid *ngIf="completed">
             <ion-row align-items-center>
-                <ion-col *ngIf="access.canviewanalysis">
-                    <button ion-button block outline icon-start (click)="showAnalysis()">
+                <ion-col *ngIf="access.canviewanalysis" col-12 [attr.col-sm-6]="(hasNextPage) || null">
+                    <button ion-button block outline icon-start (click)="showAnalysis()" text-wrap>
                         <ion-icon name="stats"></ion-icon>
                         {{ 'addon.mod_feedback.completed_feedbacks' | translate }}
                     </button>
                 </ion-col>
-                <ion-col *ngIf="hasNextPage">
-                    <button ion-button block icon-end (click)="continue()">
+                <ion-col *ngIf="hasNextPage" col-12 [attr.col-sm-6]="(access.canviewanalysis) || null">
+                    <button ion-button block icon-end (click)="continue()" text-wrap>
                         {{ 'core.continue' | translate }}
                         <ion-icon name="arrow-forward"></ion-icon>
                     </button>