diff --git a/addons/google_drive/views/res_config_settings_views.xml b/addons/google_drive/views/res_config_settings_views.xml
index 5af9c443596..20a69557340 100644
--- a/addons/google_drive/views/res_config_settings_views.xml
+++ b/addons/google_drive/views/res_config_settings_views.xml
@@ -13,9 +13,9 @@
                         <field name="google_drive_authorization_code"/>
                     </div>
                     <div>
-                        <a type="button" class="oe-link" target="_blank"><i class="fa fa-fw fa-arrow-right"/>
-                            <field name="google_drive_uri" widget="url" text=" Generate Code"/> 
-                        </a>
+                        <span type="button" class="btn-link o_btn-link-as-button fa-arrow-right">
+                            <field name="google_drive_uri" widget="url" text="Get Authorization Code"/>
+                        </span>
                     </div>
                     <div>
                         <button type="action" name="%(action_google_drive_users_config)d" string="Google Drive Templates" icon="fa-arrow-right"  class="btn-link"/>
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index dc4887eacc7..1139b234edd 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -1049,7 +1049,7 @@ var UrlWidget = InputField.extend({
      * @private
      */
     _renderReadonly: function () {
-        this.$el.text(this.value)
+        this.$el.text(this.attrs.text || this.value)
             .addClass('o_form_uri o_text_overflow')
             .attr('href', this.value);
     }
diff --git a/addons/web/static/src/less/views.less b/addons/web/static/src/less/views.less
index 701c8e8b250..ee82aa5d9e5 100644
--- a/addons/web/static/src/less/views.less
+++ b/addons/web/static/src/less/views.less
@@ -44,3 +44,13 @@
         background-color: @brand-danger;
     }
 }
+
+.o_btn-link-as-button {
+    padding: 2px;
+    font-size:12px;
+
+    & > a {
+        margin-bottom: -4px !important;
+        margin-left: 3px;
+    }
+}
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 91029cf9cfc..8560354c760 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -1040,6 +1040,24 @@ QUnit.module('basic_fields', {
         form.destroy();
     });
 
+    QUnit.test('url widget takes text from proper attribute', function (assert) {
+        assert.expect(1);
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch:'<form string="Partners">' +
+                    '<field name="foo" widget="url" text="kebeclibre">' +
+                '</form>',
+            res_id: 1,
+        });
+
+        assert.strictEqual(form.$('a[name="foo"]').text(), 'kebeclibre',
+            "url text should come from the text attribute");
+        form.destroy();
+    });
+
     QUnit.test('char field in editable list view', function (assert) {
         assert.expect(10);