diff --git a/app/js/lib/utils.js b/app/js/lib/utils.js
index 8d2f66a1..43f6e63b 100644
--- a/app/js/lib/utils.js
+++ b/app/js/lib/utils.js
@@ -275,7 +275,14 @@ function listUniqSorted (list) {
 }
 
 function templateUrl (tplName) {
-  return 'partials/' + (Config.Mobile ? 'mobile' : 'desktop') + '/' + tplName + '.html';
+  var forceLayout = {
+    confirm_modal: 'desktop',
+    error_modal: 'desktop',
+    media_modal_layout: 'desktop',
+    slider: 'desktop',
+  };
+  var layout = forceLayout[tplName] || (Config.Mobile ? 'mobile' : 'desktop');
+  return 'partials/' + layout + '/' + tplName + '.html';
 }
 
 function encodeEntities(value) {
diff --git a/app/partials/desktop/error_modal.html b/app/partials/desktop/error_modal.html
index a5a979ac..4625014a 100644
--- a/app/partials/desktop/error_modal.html
+++ b/app/partials/desktop/error_modal.html
@@ -66,7 +66,7 @@ Stack: {{error.originalError.stack || error.stack}}</textarea>
   </div>
 
   <div class="md_simple_modal_footer">
-    <button class="btn btn-md" ng-click="$dismiss()">
+    <button class="btn btn-md btn-md-primary" ng-click="$dismiss()">
       <span my-i18n="modal_ok"></span>
     </button>
   </div>
diff --git a/app/partials/mobile/confirm_modal.html b/app/partials/mobile/confirm_modal.html
deleted file mode 120000
index 4c0d83ab..00000000
--- a/app/partials/mobile/confirm_modal.html
+++ /dev/null
@@ -1 +0,0 @@
-../desktop/confirm_modal.html
\ No newline at end of file
diff --git a/app/partials/mobile/error_modal.html b/app/partials/mobile/error_modal.html
deleted file mode 120000
index 7a0888d1..00000000
--- a/app/partials/mobile/error_modal.html
+++ /dev/null
@@ -1 +0,0 @@
-../desktop/error_modal.html
\ No newline at end of file
diff --git a/app/partials/mobile/media_modal_layout.html b/app/partials/mobile/media_modal_layout.html
deleted file mode 120000
index ba26f3f7..00000000
--- a/app/partials/mobile/media_modal_layout.html
+++ /dev/null
@@ -1 +0,0 @@
-../desktop/media_modal_layout.html
\ No newline at end of file
diff --git a/app/partials/mobile/slider.html b/app/partials/mobile/slider.html
deleted file mode 120000
index 0ed70a67..00000000
--- a/app/partials/mobile/slider.html
+++ /dev/null
@@ -1 +0,0 @@
-../desktop/slider.html
\ No newline at end of file